From 6c74c14da408d05741dacfcbeff0232710fc5db8 Mon Sep 17 00:00:00 2001 From: lian Date: Fri, 12 Jun 2015 17:48:23 +0800 Subject: [PATCH] [global-addressbook] show contacts tab when is-cloud-mode AND not enabel global addressbook --- seahub/settings.py | 2 +- seahub/templates/js/templates.html | 2 ++ seahub/templates/libraries.html | 2 ++ seahub/views/__init__.py | 1 + static/scripts/app/views/myhome-side-nav.js | 7 +++++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/seahub/settings.py b/seahub/settings.py index 323163a8d7..6cf9dbf3d1 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -454,7 +454,7 @@ PREVIEW_DEFAULT_SIZE = '100' THUMBNAIL_IMAGE_SIZE_LIMIT = 30 ##################### -# Cloud Address # +# Global AddressBook # ##################### ENABLE_GLOBAL_ADDRESSBOOK = False diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html index 5ddcd7b3be..83ec714f28 100644 --- a/seahub/templates/js/templates.html +++ b/seahub/templates/js/templates.html @@ -520,7 +520,9 @@
  • {% trans "Messages" %}
  • {% trans "Devices" %}
  • + <% if (show_contacts_tab) { %>
  • {% trans "Contacts" %}
  • + <% } %>

    {% trans "Share Admin" %}

    diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html index c6cf378a9e..b99379d1bc 100644 --- a/seahub/templates/libraries.html +++ b/seahub/templates/libraries.html @@ -252,6 +252,8 @@ app["pageOptions"] = { events_enabled: {% if events_enabled %} true {% else %} false {% endif %}, can_add_repo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %}, is_staff: {% if request.user.is_staff %} true {% else %} false {% endif %}, + is_cloud_mode: {% if request.cloud_mode %} true {% else %} false {% endif %}, + enable_global_addressbook: {% if enable_global_addressbook %} true {% else %} false {% endif %}, repo_password_min_length: {{ repo_password_min_length }}, guide_enabled: {% if guide_enabled %} true {% else %} false {% endif %}, enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %}, diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index a6823d13d6..013e8feaf4 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -1173,6 +1173,7 @@ def libraries(request): "guide_enabled": guide_enabled, "sub_lib_enabled": sub_lib_enabled, 'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER, + 'enable_global_addressbook': settings.ENABLE_GLOBAL_ADDRESSBOOK, 'max_upload_file_size': max_upload_file_size, 'folder_perm_enabled': folder_perm_enabled, }, context_instance=RequestContext(request)) diff --git a/static/scripts/app/views/myhome-side-nav.js b/static/scripts/app/views/myhome-side-nav.js index f4d505cdbf..77ba47edaa 100644 --- a/static/scripts/app/views/myhome-side-nav.js +++ b/static/scripts/app/views/myhome-side-nav.js @@ -16,9 +16,16 @@ define([ }, render: function(cur_tab) { + var show_contacts_tab = false; + + if (app.pageOptions.is_cloud_mode && !app.pageOptions.enable_global_addressbook) { + show_contacts_tab = true; + } + this.$el.html(this.template({ 'mods_enabled': app.pageOptions.user_mods_enabled, 'can_add_repo': app.pageOptions.can_add_repo, + 'show_contacts_tab': show_contacts_tab, 'events_enabled': app.pageOptions.events_enabled })); this.$el.find('li').removeClass('tab-cur');