Merge pull request #35 from rafaelpezzuto/fix-deps

Fixa dependências e faz outras melhorias

README.md

@@ -171,7 +171,7 @@ __Generate translations__
 python ../manage.py compilemessages
 
 # Under docker shell, run
-docker-compose -f docker-compose.yml exec web python manage.py compilemessages group
+docker-compose -f docker-compose.yml exec web python manage.py compilemessages
 ```
 
 __Load default groups__

app/Dockerfile

@@ -17,7 +17,7 @@ RUN apk update \
     libxml2-dev \
     libxslt-dev \
     libffi-dev \
-    gettext
+    gettext-dev
 
 RUN pip install --upgrade pip
 
@@ -43,6 +43,8 @@ WORKDIR ${APP_HOME}
 
 COPY . ${APP_HOME}
 
+RUN django-admin compilemessages
+
 RUN chown -R app:app ${APP_HOME}
 
 USER app

app/core/locale/es/LC_MESSAGES/django.po

@@ -193,7 +193,7 @@ msgstr "Edite assets y renditions del artículo"
 
 #: templates/index.html:56
 msgid "Edit article metadata"
-msgstr "Edite metadata del artículo"
+msgstr "Edite metadatos del artículo"
 
 #: templates/index.html:57
 msgid "Find problems"
@@ -556,26 +556,3 @@ msgstr "Se agregó el paquete (%(name)s, %(id)s)"
 #: views.py:239
 msgid " does not have a valid format. Please provide a zip file."
 msgstr " no tiene un formato válido. Por favor, proporcione un archivo zip."
-
-#~ msgid "Reset password"
-#~ msgstr "Restablecer la contraseña"
-
-#~ msgid "Send e-mail"
-#~ msgstr "Enviar correo electrónico"
-
-#, fuzzy
-#~| msgid "Packages"
-#~ msgid "Package address"
-#~ msgstr "Direción del paquete"
-
-#~ msgid "No packages were found for document %s"
-#~ msgstr "No se encontraron paquetes para el documento %s"
-
-#~ msgid "Activities"
-#~ msgstr "Actividades"
-
-#~ msgid "All activities"
-#~ msgstr "Todas las actividades"
-
-#~ msgid "The two password fields didn’t match."
-#~ msgstr "Los dos campos de contraseña no coincidían."

app/core/locale/pt/LC_MESSAGES/django.po

@@ -189,11 +189,11 @@ msgstr "Agendar artigo para publicação"
 
 #: templates/index.html:55
 msgid "Edit article assets and renditions"
-msgstr "Edite assets y renditions"
+msgstr "Edite assets e renditions"
 
 #: templates/index.html:56
 msgid "Edit article metadata"
-msgstr "Edite metadata del artículo"
+msgstr "Edite metadados do artigo"
 
 #: templates/index.html:57
 msgid "Find problems"
@@ -557,24 +557,3 @@ msgstr "Pacote (%(name)s, %(id)s) foi adicionado"
 msgid " does not have a valid format. Please provide a zip file."
 msgstr ""
 " não possui um formato válido. Por favor, forneça um arquivo em formato zip."
-
-msgid "Reset password"
-#~ msgstr "Redefinir senha"
-
-#~ msgid "Send e-mail"
-#~ msgstr "Enviar e-mail"
-
-#~ msgid "Package address"
-#~ msgstr "Endereço do pacote"
-
-#~ msgid "No packages were found for document %s"
-#~ msgstr "Não foram encontrados pacotes para o documento %s"
-
-#~ msgid "Activities"
-#~ msgstr "Atividades"
-
-#~ msgid "All activities"
-#~ msgstr "Todas as atividades"
-
-#~ msgid "The two password fields didn’t match."
-#~ msgstr "As duas senhas são diferentes."

app/core/templates/index.html

@@ -84,7 +84,7 @@ <h1 class="h4 pt-5">{% trans 'Home' %}</h1>
                 </div>
                 <div class="list-group list-group-flush">
                     <a class="list-group-item" href="{% url 'ingress_package_list' %}?scope=all_users">{% trans 'All deposited packages' %}</a>
-                    <a class="list-group-item" href="{% url 'ingress_article_files_list' %}">{% trans "Articles' files" %}</a>
+                    <a class="list-group-item disabled" href="">{% trans "Articles' files" %}</a>
                 </div>
             </div>
         </div>

app/core/urls.py

@@ -22,7 +22,6 @@
     path('ingress/package_upload/', views.ingress_package_upload_page, name='ingress_package_upload'),
     path('ingress/package_download/', views.ingress_package_download_page, name='ingress_package_download'),
     path('ingress/package_list/', views.ingress_package_list_page, name='ingress_package_list'),
-    path('ingress/articles_files/', views.ingress_articles_files_page, name='ingress_article_files_list'),
 ]
 
 journal = [

app/core/views.py

@@ -288,18 +288,6 @@ def ingress_package_list_page(request):
     return render(request, 'ingress/package_list.html', context={'deposited_package_obj': deposited_package_obj, 'scope': request_scope})
 
 
-@login_required(login_url='login')
-@allowed_users(allowed_groups=['manager', 'operator_ingress'])
-def ingress_articles_files_page(request):
-    article_files_list = dsm_ingress._docs_manager.get_articles_files()
-
-    paginator = Paginator(article_files_list, 25)
-    page_number = request.GET.get('page')
-    article_files_obj = paginator.get_page(page_number)
-
-    return render(request, 'ingress/article_files_list.html', context={'article_files_obj': article_files_obj})
-
-
 #################
 # journal views #
 #################

app/requirements.txt

@@ -10,6 +10,6 @@ sqlparse==0.4.1
 lxml==4.6.3
 minio==7.1.0
 gunicorn==20.1.0
--e git+https://github.com/scieloorg/opac_schema.git#egg=opac_schema
--e git+https://github.com/scieloorg/dsm.git#egg=dsm
--e git+https://github.com/scieloorg/scielo_v3_manager.git#egg=scielo_v3_manager
+-e git+https://github.com/scieloorg/opac_schema.git@v2.62#egg=opac_schema
+-e git+https://github.com/scieloorg/dsm.git@v0.1#egg=dsm
+-e git+https://github.com/scieloorg/scielo_v3_manager.git@0.6#egg=scielo_v3_manager

app/setup.py

@@ -23,7 +23,7 @@
 
 setuptools.setup(
     name="SciELO Publishing Framework",
-    version="0.1",
+    version="0.1.4.4",
     author="SciELO",
     author_email="[email protected]",
     description="This is the SciELO Upload Framework",