Merge pull request #1114 from scieloorg/beta

Incorporação de códigos estáveis.

Author: jamilatta

Makefile

@@ -11,7 +11,6 @@ clean:
 	@echo "Removing all .pyc files..."
 	@find . -name "*.pyc" -delete
 	@echo "Removing articletrack db structure..."
-	@python $(APP_PATH)/clear_articletrack_contenttypes.py 2> /tmp/clear_articletrack_contenttypes.out
 
 test: 
 	@python $(MANAGE) test --settings=$(SETTINGS_TEST)

scielomanager/clear_articletrack_contenttypes.py

@@ -32,7 +32,7 @@ class EditorialMemberFactory(factory.Factory):
     role = factory.SubFactory(RoleTypeFactory)
     board = factory.SubFactory(EditorialBoardFactory)
 
-    #Required fields
+    # Required fields
     first_name = factory.Sequence(lambda n: "first_name_%s" % n)
     last_name = factory.Sequence(lambda n: "last_name_%s" % n)
     email = factory.Sequence(lambda n: "email%[email protected]" % n)

scielomanager/drop_articletrack_tables.sql

@@ -8,7 +8,10 @@
 from journalmanager.tests import modelfactories
 
 from . import modelfactories as editorial_modelfactories
-from editorialmanager.models import EditorialMember, EditorialBoard, RoleType, RoleTypeTranslation
+from editorialmanager.models import (EditorialMember,
+                                     EditorialBoard,
+                                     RoleType,
+                                     RoleTypeTranslation)
 from audit_log.models import AuditLogEntry, ADDITION, CHANGE, DELETION
 
 
@@ -64,7 +67,7 @@ def test_editor_edit_journal_with_valid_formdata(self):
         of the list.
 
         In order to take this action, the user needs be part of this group:
-        ``superuser`` or ``editors`` or ``librarian``
+        ``superuser`` or ``editors`` or ``librarian`` or ``trainee``
         """
 
         use_license = modelfactories.UseLicenseFactory.create()
@@ -129,7 +132,7 @@ def test_add_user_as_editor_formdata(self):
         the editor area and journal have a new editor of the journal
 
         In order to take this action, the user needs be part of this group:
-        ``superuser`` or ``librarian``
+        ``superuser`` or ``librarian`` or ``trainee``
         """
 
         group = modelfactories.GroupFactory(name="Editors")
@@ -505,8 +508,9 @@ def test_DELETE_board_member_valid_POST_is_valid(self):
 
 class EditorialMemberFormAsLibrarianTests(EditorialMemberFormAsEditorTests):
     """
-    Excecute the same tests that an Editors (EditorialMemberFormAsEditorTests), the setUp is almost the same.
-    Only change is that the self.user is assigned as a member of "Librarian" group instead of "Editors" group.
+    Excecute the same tests that an Editors (EditorialMemberFormAsEditorTests),
+    the setUp is almost the same.Only change is that the self.user is assigned
+    as a member of "Librarian" group instead of "Editors" group.
     """
     def setUp(self):
         super(EditorialMemberFormAsLibrarianTests, self).setUp()
@@ -522,6 +526,26 @@ def tearDown(self):
         super(EditorialMemberFormAsLibrarianTests, self).tearDown()
 
 
+class EditorialMemberFormAsTraineeTests(EditorialMemberFormAsEditorTests):
+    """
+    Excecute the same tests that an Editors (EditorialMemberFormAsEditorTests),
+    the setUp is almost the same. Only change is that the self.user is assigned
+    as a member of "Trainee" group instead of "Editors" group.
+    """
+    def setUp(self):
+        super(EditorialMemberFormAsTraineeTests, self).setUp()
+        # change user group to belong to Trainee group
+        self.user.groups.clear()
+        group = modelfactories.GroupFactory(name="Trainee")
+        self.user.groups.add(group)
+        self.user.save()
+
+        _add_required_permission_to_group(group)
+
+    def tearDown(self):
+        super(EditorialMemberFormAsTraineeTests, self).tearDown()
+
+
 class MembersSortingOnActionTests(WebTest):
 
     def setUp(self):

scielomanager/editorialmanager/tests/modelfactories.py

@@ -155,14 +155,14 @@ def _do_move_board_block(board_pk, position, direction):
 
 
 def _user_has_access(user):
-    return user.is_superuser or user.get_profile().is_editor or user.get_profile().is_librarian
+    return user.is_superuser or user.get_profile().is_editor or user.get_profile().is_librarian or user.get_profile().is_trainee
 
 
 def _get_journals_by_user_access(user):
     user_profile = user.get_profile()
     if user_profile.is_editor:
         journals = Journal.userobjects.active().filter(editor=user)
-    elif user_profile.is_librarian or user.is_superuser:
+    elif user_profile.is_librarian or user.is_superuser or user_profile.is_trainee:
         journals = Journal.userobjects.active()
     else:
         journals = []
@@ -236,7 +236,11 @@ def edit_journal(request, journal_id):
             helpers.log_change(**audit_data)
 
             messages.success(request, _('Journal updated successfully.'))
-            return HttpResponseRedirect(reverse('editorial.index'))
+
+            if request.user.get_profile().is_editor:
+                return HttpResponseRedirect(reverse('editorial.index'))
+            else:
+                return HttpResponseRedirect(reverse('journal.dash', args=[journal.id]))
         else:
             messages.error(request, _('Check mandatory fields.'))
 

scielomanager/editorialmanager/tests/test_forms.py

@@ -319,6 +319,10 @@ def is_editor(self):
     def is_librarian(self):
         return self.user.groups.filter(name__iexact='Librarian').exists()
 
+    @property
+    def is_trainee(self):
+        return self.user.groups.filter(name__iexact='Trainee').exists()
+
     @property
     def gravatar_id(self):
         return hashlib.md5(self.user.email.lower().strip()).hexdigest()

scielomanager/editorialmanager/views.py

@@ -1,4 +1,4 @@
-#coding: utf-8
+# coding: utf-8
 import json
 import urlparse
 from datetime import datetime