diff --git a/modoboa/admin/static/admin/js/admin.js b/modoboa/admin/static/admin/js/admin.js index e635fd613..087434257 100644 --- a/modoboa/admin/static/admin/js/admin.js +++ b/modoboa/admin/static/admin/js/admin.js @@ -172,12 +172,9 @@ Domains.prototype = { if (this.navobj.getbaseurl() === "list") { args.objtype = "domain"; this.options.eor_message = gettext("No more domain to show"); - } else if (this.navobj.getbaseurl() === "quota") { + } else { 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; }, diff --git a/modoboa/admin/templatetags/admin_tags.py b/modoboa/admin/templatetags/admin_tags.py index ca1c37b7d..cc2d36aed 100644 --- a/modoboa/admin/templatetags/admin_tags.py +++ b/modoboa/admin/templatetags/admin_tags.py @@ -36,12 +36,10 @@ 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"), @@ -53,11 +51,6 @@ 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( diff --git a/modoboa/admin/urls.py b/modoboa/admin/urls.py index b36f8ba76..1f10a8520 100644 --- a/modoboa/admin/urls.py +++ b/modoboa/admin/urls.py @@ -22,8 +22,6 @@ 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"), diff --git a/modoboa/admin/views/domain.py b/modoboa/admin/views/domain.py index d76c7a777..89b151cb5 100644 --- a/modoboa/admin/views/domain.py +++ b/modoboa/admin/views/domain.py @@ -160,42 +160,6 @@ 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()