Merge pull request #1007 from scieloorg/beta

Incorporação de códigos estáveis

Author: gustavofonseca

docs/dev/journals-api.rst

@@ -187,6 +187,11 @@ Response:
           "study_areas": [
             "Biological Sciences"
           ],
+          subject_categories: [
+          "Humanities, Multidisciplinary",
+          "Social Sciences, Interdisciplinary",
+          "Sociology"
+          ],
           "subject_descriptors": "biologia\nbotanica",
           "succeeding_title": null,
           "title": "Acta bot\u00c3\u00a1nica mexicana",

scielomanager/api/resources_v1.py

@@ -24,6 +24,7 @@
     PressReleaseTranslation,
     PressReleaseArticle,
     Article,
+    SubjectCategory,
 )
 
 from scielomanager.utils import usercontext
@@ -160,14 +161,18 @@ class Meta(ApiKeyAuthMeta):
         resource_name = 'collections'
         allowed_methods = ['get', ]
 
+class SubjectCategoryResource(ModelResource):
+    class Meta(ApiKeyAuthMeta):
+        queryset = SubjectCategory.objects.all()
+        resource_name = 'subjectcategory'
+        allowed_methods = ['get', ]
 
 class SponsorResource(ModelResource):
     class Meta(ApiKeyAuthMeta):
         queryset = Sponsor.objects.all()
         resource_name = 'sponsors'
         allowed_methods = ['get', ]
 
-
 class UseLicenseResource(ModelResource):
     class Meta(ApiKeyAuthMeta):
         queryset = UseLicense.objects.all()
@@ -200,6 +205,7 @@ class JournalResource(ModelResource):
     collections = fields.ManyToManyField(CollectionResource, 'collections')
     issues = fields.OneToManyField(IssueResource, 'issue_set')
     sections = fields.OneToManyField(SectionResource, 'section_set')
+    subject_categories = fields.ManyToManyField(SubjectCategoryResource, 'subject_categories', readonly=True)
     pub_status_history = fields.ListField(readonly=True)
     contact = fields.DictField(readonly=True)
     study_areas = fields.ListField(readonly=True)
@@ -275,6 +281,10 @@ def dehydrate_languages(self, bundle):
         return [language.iso_code
             for language in bundle.obj.languages.all()]
 
+    def dehydrate_subject_categories(self, bundle):
+        return [subject_category.term
+            for subject_category in bundle.obj.subject_categories.all()]
+
     def dehydrate_pub_status_history(self, bundle):
         return [{'date': event.since,
                 'status': event.status}

scielomanager/api/tests_resources_v1.py

@@ -181,6 +181,7 @@ def test_api_v1_datamodel(self):
             u'editor_name',
             u'other_previous_title',
             u'study_areas',
+            u'subject_categories',
             u'medline_code',
             u'is_trashed',
             u'init_num',

scielomanager/scielomanager/static/js/modal.js

@@ -3,8 +3,8 @@ $(function() {
   /* hack to reload ajax content, and avoid caching trap */
   $('.modal').on('hidden', function() { $(this).removeData(); })
   $('.modal').on('shown', function () {
-    $('input').addClass('span12');
-    $(".chzn-select").chosen({
+    $(this).find('input').addClass('span12');
+    $(this).find(".chzn-select").chosen({
       no_results_text: "{% trans 'No results found for' %}:",
       width: "100%",
     });

scielomanager/validator/utils.py

@@ -8,7 +8,7 @@
 
 try:
     PACKTOOLS_VERSION = pkg_resources.get_distribution('packtools').version
-except DistributionNotFound:
+except pkg_resources.DistributionNotFound:
     PACKTOOLS_VERSION = None