matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace use of mayan.__title__ with common project title to ensure the overrided name is displayed in all views.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-08-28 03:48:51 -04:00
parent 5eba4f67e5
commit 6594756c5b
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mayan/apps/appearance/templates/appearance/base_plain.html
View File

@@ -3,6 +3,7 @@
{% load common_tags %}
{% load navigation_tags %}
{% load smart_settings_tags %}
{% spaceless %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -15,7 +16,7 @@
<meta http-equiv="Content-Language" content="{{ LANGUAGE_CODE }}" />
<title>
{% block base_title %}
{% block title %}{% endblock %} :: {% block project_name %}{% project_information '__title__' %}{% endblock %}
{% block title %}{% endblock %} :: {% block project_name %} {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}{% endblock %}
{% endblock base_title %}
</title>

3
mayan/apps/authentication/views.py
View File

@@ -16,6 +16,7 @@ from django.utils.translation import ugettext_lazy as _
from stronghold.decorators import public
from common.settings import setting_project_title
import mayan
from .forms import EmailAuthenticationForm, UsernameAuthenticationForm
@@ -152,7 +153,7 @@ def password_reset_view(request):
request, extra_context=extra_context,
email_template_name='authentication/password_reset_email.html',
extra_email_context={
'project_title': mayan.__title__,
'project_title': setting_project_title.value,
'project_website': mayan.__website__,
'project_copyright': mayan.__copyright__,
'project_license': mayan.__license__,

5
mayan/apps/mailer/forms.py
View File

@@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _
from acls.models import AccessControlList
from common.forms import DynamicModelForm
from common.settings import setting_project_title
import mayan
@@ -32,7 +33,7 @@ class DocumentMailForm(forms.Form):
self.fields[
'body'
].initial = setting_document_body_template.value % {
'project_title': mayan.__title__,
'project_title': setting_project_title.value,
'project_website': mayan.__website__
}
else:
@@ -40,7 +41,7 @@ class DocumentMailForm(forms.Form):
'subject'
].initial = setting_link_subject_template.value
self.fields['body'].initial = setting_link_body_template.value % {
'project_title': mayan.__title__,
'project_title': setting_project_title.value,
'project_website': mayan.__website__
}

3
mayan/apps/rest_api/schemas.py
View File

@@ -4,10 +4,11 @@ from django.utils.translation import ugettext_lazy as _
from drf_yasg import openapi
from common.settings import setting_project_title
import mayan
openapi_info = openapi.Info(
title=_('%s API') % mayan.__title__,
title=_('%s API') % setting_project_title.value,
default_version='v2',
description=mayan.__description__,
license=openapi.License(name=mayan.__license__),