Merge pull request #1214 from scieloorg/beta

Incorporação de códigos estáveis

requirements.txt

@@ -3,7 +3,6 @@ South
 psycopg2==2.4.1
 wsgiref==0.1.2
 scielo-django-extensions==0.4
-python-memcached==1.48
 ordereddict==1.1
 pillow==2.3.0
 django-widget-tweaks==1.1.1
@@ -14,7 +13,6 @@ yuicompressor
 jsonfield
 django-tastypie==0.9.16
 django-htmlmin==0.7.0
--e git+git://github.com/scieloorg/django-cache-machine.git#egg=django-cache-machine
 packtools
 Celery
 django-celery

scielomanager/accounts/templates/accounts/unauthorized.html

@@ -7,7 +7,7 @@
       <h4>{% trans "You are not authorized to access the requested page." %}</h4>
       {% trans " Maybe you want to " %}
       <a href="{% url journalmanager.user_login %}{% if next %}?next={{ next }}{% endif %}">
-      {% trans "login <strong>with a more previleged account</strong></a> or contact support." %} 
+      {% trans "login <strong>with a more privileged account</strong></a> or contact support." %}
   	</div>
 </div>
 {% endblock %}

scielomanager/editorialmanager/templates/journal/journal_detail.html

@@ -50,7 +50,7 @@
       </td>
     </tr>
     <tr>
-      <td class="table-journal-detail-td"><b>{% trans 'Lanaguages' %}:</b></td>
+      <td class="table-journal-detail-td"><b>{% trans 'Languages' %}:</b></td>
       <td>
         <ul>
           {% for lang in journal.languages.all %}

scielomanager/editorialmanager/templates/journal/journal_list.html

@@ -36,7 +36,7 @@
                       <i class="icon-pencil"></i> {% trans 'Edit Journal' %}
                     </a>
                     <a href="{% url editorial.board journal.pk %}" class="btn btn-mini">
-                      <i class="icon-list-alt"></i> {% trans 'Corpo editorial' %}
+                      <i class="icon-list-alt"></i> {% trans 'Editorial Board' %}
                     </a>
                   </div>
               </td>

scielomanager/export/templates/export/markup_files.html

@@ -36,7 +36,7 @@
       <div class="controls">
         {{ form.issue }}
         <span id="loading" style="display: none; margin: 5px;">
-          <img src="/static/images/loading.gif" width="20px" heigth="20px" />
+          <img src="{% static 'img/loading.gif' %}" width="20px" heigth="20px" />
           {% trans 'Retrieving its issues' %}
         </span>
       </div>

scielomanager/health/checks.py

@@ -1,10 +1,9 @@
-#coding: utf-8
+# coding: utf-8
 import logging
 import uuid
 
 import psycopg2
 from django.db import connections, DatabaseError
-from django.core.cache import cache
 from celery import current_app
 from kombu import Connection
 
@@ -24,6 +23,7 @@ class PGConnection(CheckItem):
             psycopg2.extensions.STATUS_IN_TRANSACTION,
             psycopg2.extensions.STATUS_PREPARED,
     )
+
     def __init__(self):
         self.must_fail = False
 
@@ -55,20 +55,6 @@ def __call__(self):
             return True
 
 
-class CachingBackend(CheckItem):
-    """
-    Connection with the caching backend
-    """
-    def __call__(self):
-        key = uuid.uuid4().hex
-
-        try:
-            ret_code = cache.add(key, '\x01', timeout=1)
-            return bool(ret_code)
-        finally:
-            cache.delete(key)
-
-
 class CeleryConnection(CheckItem):
     """
     Connection with celery backend.

scielomanager/health/management/commands/healthd.py

@@ -13,7 +13,6 @@
 def get_checklist():
     checklist = health.CheckList()
     checklist.add_check(checks.PGConnection())
-    checklist.add_check(checks.CachingBackend())
     checklist.add_check(checks.CeleryConnection())
     checklist.add_check(checks.RabbitConnection())
 
@@ -58,4 +57,3 @@ def handle(self, *args, **kwargs):
             server.run()
         except KeyboardInterrupt:
             logger.info('healthd is shutting down')
-

scielomanager/journalmanager/admin.py

@@ -21,38 +21,20 @@ class SectionTitleInline(admin.StackedInline):
     model = SectionTitle
 
 
-class StudyAreaAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return StudyArea.nocacheobjects
-
-admin.site.register(StudyArea, StudyAreaAdmin)
+admin.site.register(StudyArea)
 
 
 class CollectionAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Collection.nocacheobjects
-
     list_display = ('name',)
     search_fields = ('name',)
 
 admin.site.register(Collection, CollectionAdmin)
 
 
-class SectionAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Section.nocacheobjects
-
-admin.site.register(Section, SectionAdmin)
+admin.site.register(Section)
 
 
 class JournalAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Journal.nocacheobjects
-
     list_display = ('title',)
     search_fields = ('title',)
     filter_horizontal = ('languages',)
@@ -62,31 +44,19 @@ def queryset(self, request):
 
 
 class InstitutionAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Institution.nocacheobjects
-
     list_display = ('name',)
     search_fields = ('name',)
 
 admin.site.register(Institution, InstitutionAdmin)
 
 
 class UserCollectionsInline(admin.TabularInline):
-
-    def queryset(self, request):
-        return UserCollections.nocacheobjects
-
     model = UserCollections
     extra = 1
     can_delete = True
 
 
 class UserProfileInline(admin.StackedInline):
-
-    def queryset(self, request):
-        return UserProfile.nocacheobjects
-
     model = UserProfile
     max_num = 1
     can_delete = True
@@ -127,83 +97,51 @@ def profile_email_notifications(self, user):
 
 
 class IssueAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Issue.nocacheobjects
-
     search_fields = ('publication_year', 'volume', 'number', 'journal__title')
     list_display = ('journal', 'volume', 'number', 'is_trashed', 'is_marked_up', '__unicode__',)
 
 admin.site.register(Issue, IssueAdmin)
 
 
 class SponsorAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Sponsor.nocacheobjects
-
     filter_horizontal = ('collections',)
 
 admin.site.register(Sponsor, SponsorAdmin)
 
 
 class UseLicenseAdmin(admin.ModelAdmin):
     list_display = ('license_code', 'is_default', )
-    def queryset(self, request):
-        return UseLicense.nocacheobjects
 
 admin.site.register(UseLicense, UseLicenseAdmin)
-
-
-class LanguageAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Language.nocacheobjects
-
-admin.site.register(Language, LanguageAdmin)
-
-
-class TranslatedDataAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return TranslatedData.nocacheobjects
-
+admin.site.register(Language)
 admin.site.register(TranslatedData)
+admin.site.register(PressRelease)
 
 
-class PressReleaseAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return PressRelease.nocacheobjects
-
-admin.site.register(PressRelease, PressReleaseAdmin)
-
-
-#--------
+# --------
 # Article
-#--------
+# --------
+
 def is_linked_to_issue(article):
     return bool(article.issue)
 is_linked_to_issue.boolean = True
 
+
 def is_linked_to_journal(article):
     return bool(article.journal)
 is_linked_to_issue.boolean = True
 
 
 class ArticleAdmin(admin.ModelAdmin):
     list_display = (
-            'aid', 'xml_version', 'domain_key','updated_at',
+            'aid', 'xml_version', 'domain_key', 'updated_at',
             is_linked_to_issue, is_linked_to_journal,
     )
     list_filter = ('issue__journal',)
     date_hierarchy = 'updated_at'
     actions = ['link_to_issue', 'link_to_journal']
     readonly_fields = ('domain_key', 'xml', 'is_aop', 'xml_version', )
 
-    def queryset(self, request):
-        return Article.nocacheobjects
-
     def link_to_issue(self, request, queryset):
         for article in queryset:
             tasks.link_article_to_issue.delay(article.pk)

scielomanager/journalmanager/forms.py

@@ -184,17 +184,26 @@ def clean_cover(self):
         if cover:
             if not cover.name:
                 if cover.content_type not in settings.IMAGE_CONTENT_TYPE:
-                    raise forms.ValidationError(_(u"Journal cover image extension is not allowed! Please select another file."))
+                    raise forms.ValidationError(
+                        _(u"Journal cover image extension is not allowed! Please select another file."))
 
             if cover.size > settings.JOURNAL_COVER_MAX_SIZE:
-                raise forms.ValidationError(_(u"Journal cover image file size is too large! Please select another file."))
+                raise forms.ValidationError(
+                    _(u"Journal cover image file size is too large! Please select another file."))
 
             w, h = get_image_dimensions(cover)
 
             if w != settings.IMAGE_DIMENSIONS['width_cover']:
-                raise forms.ValidationError(_(u"The image is %ipx pixel wide. It's supposed to be %spx") % (w, settings.IMAGE_DIMENSIONS['width_cover']))
+                raise forms.ValidationError(
+                    _(u"The image is {image_size}px pixel wide. It's supposed to be {expected_size}px".format(
+                        image_size=w,
+                        expected_size=settings.IMAGE_DIMENSIONS['width_cover'])))
+
             if h != settings.IMAGE_DIMENSIONS['height_cover']:
-                raise forms.ValidationError("The image is %ipx pixel high. It's supposed to be %spx" % (h, settings.IMAGE_DIMENSIONS['height_cover']))
+                raise forms.ValidationError(
+                    _("The image is {image_size}px pixel high. It's supposed to be {expected_size}px".format(
+                        image_size=h,
+                        expected_size=settings.IMAGE_DIMENSIONS['height_cover'])))
 
         return cover
 
@@ -211,9 +220,13 @@ def clean_logo(self):
             w, h = get_image_dimensions(logo)
 
             if w != settings.IMAGE_DIMENSIONS['width_logo']:
-                raise forms.ValidationError(_("The image is %ipx pixel wide. It's supposed to be %spx") % (w, settings.IMAGE_DIMENSIONS['width_logo']))
+                raise forms.ValidationError(_("The image is {logo_size}px pixel wide. It's supposed to be {expected_size}px".format(
+                    logo_size=w,
+                    expected_size=settings.IMAGE_DIMENSIONS['width_logo'])))
             if h != settings.IMAGE_DIMENSIONS['height_logo']:
-                raise forms.ValidationError(_("The image is %ipx pixel high. It's supposed to be %spx") % (h, settings.IMAGE_DIMENSIONS['height_logo']))
+                raise forms.ValidationError(_("The image is {logo_size}px pixel high. It's supposed to be {expected_size}px".format(
+                    logo_size=h,
+                    expected_size=settings.IMAGE_DIMENSIONS['height_logo'])))
 
         return logo
 

scielomanager/journalmanager/modelmanagers.py

@@ -29,7 +29,6 @@
 * ``unavailable`` returns all objects marked as trash.
 
 """
-import caching.base
 import models
 from scielomanager.utils import usercontext
 from scielomanager.utils.modelmanagers import UserObjectQuerySet, UserObjectManager