Fixed wrong help text.

This commit is contained in:
Antoine Nguyen
2020-04-17 10:21:18 +02:00
parent 8e5dfd67ad
commit 89b795bcff
23 changed files with 6527 additions and 6449 deletions
+2 -2
View File
@@ -148,8 +148,8 @@ class AdminParametersForm(param_forms.AdminParametersForm):
label=ugettext_lazy("Default mailbox quota"),
initial=0,
help_text=ugettext_lazy(
"Default mailbox quota (in MB) applied to freshly created domains "
"with no value specified. A value of 0 means no quota."
"Default mailbox quota (in MB) applied to freshly created "
"mailboxes with no value specified. A value of 0 means no quota."
)
)
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+6 -3
View File
@@ -172,9 +172,12 @@ Domains.prototype = {
if (this.navobj.getbaseurl() === "list") {
args.objtype = "domain";
this.options.eor_message = gettext("No more domain to show");
} else {
} else if (this.navobj.getbaseurl() === "quota") {
args.objtype = "quota";
this.options.eor_message = gettext("No more quota to show");
} else {
args.objtype = "messages";
this.options.eor_message = gettext("No more message to show");
}
return args;
},
@@ -217,7 +220,7 @@ Domains.prototype = {
* A new page has been received, inject it.
*
* @param {Object} data - page content
* @param {string} direction -
* @param {string} direction -
*/
add_new_page: function(data, direction) {
Admin.prototype.add_new_page.call(this, data, direction);
@@ -439,7 +442,7 @@ Identities.prototype = {
* A new page has been received, inject it.
*
* @param {Object} data - page content
* @param {string} direction -
* @param {string} direction -
*/
add_new_page: function(data, direction) {
Admin.prototype.add_new_page.call(this, data, direction);
+7
View File
@@ -36,10 +36,12 @@ def domains_menu(selection, user, ajax_mode=True):
if ajax_mode:
domain_list_url = "list/"
quota_list_url = "quotas/"
messages_log_url = "messages/"
nav_classes += " ajaxnav"
else:
domain_list_url = reverse("admin:domain_list")
quota_list_url = domain_list_url + "#quotas/"
messages_log_url = domain_list_url + "#messages/"
entries = [
{"name": "domains",
"label": _("List domains"),
@@ -51,6 +53,11 @@ def domains_menu(selection, user, ajax_mode=True):
"img": "fa fa-hdd-o",
"class": "ajaxnav navigation",
"url": quota_list_url},
{"name": "logs",
"label": _("Messages log"),
"img": "fa fa-list",
"class": "ajaxnav navigation",
"url": messages_log_url},
]
if user.has_perm("admin.add_domain"):
extra_entries = signals.extra_domain_menu_entries.send(
+2
View File
@@ -22,6 +22,8 @@ urlpatterns = [
path('domains/list/', domain_views._domains, name="_domain_list"),
path('domains/quotas/', domain_views.list_quotas,
name="domain_quota_list"),
path('domains/messages/', domain_views.messages_log,
name="domain_messages_log"),
path('domains/flatlist/', domain_views.domains_list,
name="domain_flat_list"),
path('domains/new/', domain_views.newdomain, name="domain_add"),
+36
View File
@@ -160,6 +160,42 @@ def list_quotas(request):
return render_to_json_response(context)
@login_required
@permission_required("admin.view_domain")
def messages_log(request):
# page = get_listing_page(domains, request.GET.get("page", 1))
page = [
{"id": "6EE64E00AE",
"date": "19/03/2020 11:00:00",
"from": "antoine@modoboa.com",
"to": "user@example.test",
"status": "sent"},
{"id": "6EE64E00AF",
"date": "19/03/2020 12:00:00",
"from": "antoine@modoboa.com",
"to": "user@example.test",
"status": "sent"},
{"id": "6EE64E00AD",
"date": "19/03/2020 14:00:00",
"from": "antoine@modoboa.com",
"to": "user@example.test",
"status": "sent"}
]
context = {
"headers": render_to_string(
"admin/messages_log_headers.html", {}, request
)
}
if page is None:
context["length"] = 0
else:
context["rows"] = render_to_string(
"admin/messages_log.html", {"messages": page}, request
)
# context["pages"] = [page.number]
return render_to_json_response(context)
@login_required
@permission_required("admin.add_domain")
@reversion.create_revision()