From d0e9dbd86d2c0faaa885103cfcac43eae4f58a15 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Tue, 23 Apr 2013 17:19:26 +0800
Subject: [PATCH] Disable shared link in encrypt repo, and fix bug when
 deleteing home page in personal wiki.

---
 templates/repo.html           | 10 ++++++++--
 templates/view_file_base.html |  2 ++
 views/wiki.py                 |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/templates/repo.html b/templates/repo.html
index 610702d3c7..3c51bb8c85 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -30,10 +30,12 @@
                 <button id="recycle-btn" data="{% url 'repo_recycle_view' repo.id %}" class="repo-top-op-btn"><span class="icon-trash"></span>{% trans "Trash"%}</button>
                 {% endif %}
             {% else %}
+              {% if not repo.encrypted %}
                 <input id="shared-link" class="hide" type="text" readonly="readonly" value="{{ dir_shared_link }}" />
                 <button data="{% url 'get_shared_link' %}?repo_id={{ repo.id }}&p={{ path|urlencode }}&type=d" id="get-shared-link" class="hide">{% trans "Share link"%}</button>
                 <button id="send-shared-link" class="hide">{% trans "Send"%}</button>
                 <button data="{% url 'remove_shared_link' %}?t={{ fileshare.token }}" id="rm-shared-link" class="hide">{% trans "Delete"%}</button>
+              {% endif %}
             {% endif %}
         </div>
     </div>
@@ -135,7 +137,9 @@
                         <div class="repo-file-op vh">
                             <div class="displayed-op">
                                 <a class="op" href="{% url 'repo_download_dir' repo.id %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{% trans 'Download' %}</a>
-                                  <a class="op file-share" href="#" data-name="{{ dirent.obj_name }}" data-link="{{ dirent.sharelink }}" data-token="{{ dirent.sharetoken }}" data-type="d">{% trans "Share" %}</a>
+                              {% if not repo.encrypted %}
+                                <a class="op file-share" href="#" data-name="{{ dirent.obj_name }}" data-link="{{ dirent.sharelink }}" data-token="{{ dirent.sharetoken }}" data-type="d">{% trans "Share" %}</a>
+                              {% endif %}
                             </div>
                             {% if user_perm == 'rw' %}
                             <img src="{{ MEDIA_URL }}img/dropdown-arrow.png" title="{% trans 'More operations'%}" alt="{% trans 'More operations'%}" class="more-op-icon" data="no-popup" />
@@ -180,7 +184,9 @@
                                 <a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}&op=download">{% trans "Download"%}</a>
                                 {% if user_perm == 'rw' %}
                                   <a class="op update-file" data-target="{{ path }}{{dirent.obj_name}}" href="#">{% trans "Update"%}</a>
-                                    <a class="op file-share" href="#" data-name="{{ dirent.obj_name }}" data-link="{{ dirent.sharelink }}" data-token="{{ dirent.sharetoken }}">{% trans "Share" %}</a>
+                                  {% if not repo.encrypted %}
+                                  <a class="op file-share" href="#" data-name="{{ dirent.obj_name }}" data-link="{{ dirent.sharelink }}" data-token="{{ dirent.sharetoken }}">{% trans "Share" %}</a>
+                                  {% endif %}
                                 {% endif %}
                             </div>
                             {% if user_perm == 'rw' %}
diff --git a/templates/view_file_base.html b/templates/view_file_base.html
index 75132e382f..089b6935a5 100644
--- a/templates/view_file_base.html
+++ b/templates/view_file_base.html
@@ -29,10 +29,12 @@
         </p>
 
         <div class="file-op fright">
+            {% if not repo.encrypted %}
             <input id="shared-link" class="hide" type="text" readonly="readonly" value="{{ file_shared_link }}" />
             <button data="{% url 'get_shared_link' %}?repo_id={{ repo.id }}&p={{ path|urlencode }}" id="get-shared-link" class="hide">{% trans "Share link"%}</button>
             <button id="send-shared-link" class="hide">{% trans "Send"%}</button>
             <button data="{% url 'remove_shared_link' %}?t={{ fileshare.token }}" id="rm-shared-link" class="hide">{% trans "Delete"%}</button>
+            {% endif %}
             {% if is_starred %}
             <button id="star" data-status="starred">{% trans "Unstar"%}</button>
             {% else %}
diff --git a/views/wiki.py b/views/wiki.py
index 43229f96fc..f8475dff00 100644
--- a/views/wiki.py
+++ b/views/wiki.py
@@ -51,7 +51,7 @@ def personal_wiki(request, page_name="home"):
     except WikiPageMissing:
         repo = get_personal_wiki_repo(username)
         filename = clean_page_name(page_name) + '.md'
-        if not post_empty_file(repo.id, "/", filename, username):
+        if not seaserv.post_empty_file(repo.id, "/", filename, username):
             return render_error(request, _("Failed to create wiki page. Please retry later."))
         return HttpResponseRedirect(reverse('personal_wiki', args=[page_name]))
     else: