From 3e3718d01724c1d5c87fd138a869e8afb8634031 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Fri, 22 Feb 2013 17:00:47 +0800
Subject: [PATCH] Fixed name conflict in unset pub repo, and improve message

---
 share/templates/repo/share_admin.html |  2 +-
 urls.py                               |  2 +-
 views.py                              | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/share/templates/repo/share_admin.html b/share/templates/repo/share_admin.html
index 2a9dc0b62d..efba66b80e 100644
--- a/share/templates/repo/share_admin.html
+++ b/share/templates/repo/share_admin.html
@@ -60,7 +60,7 @@
 	  {% endif %}
 	  {% if repo.props.share_type == 'public' %}
 	      {% if not org %}
-	      <a href="#" data="{{ SITE_ROOT }}repo/unsetinnerpub/{{ repo.props.repo_id }}" class="cancel-share op">{% trans "Unshare"%}</a>
+	      <a href="#" data="{% url 'unsetinnerpub' repo.repo_id %}" class="cancel-share op">{% trans "Unshare"%}</a>
 	      {% else %}
 	      <a href="#" data="{{ SITE_ROOT }}organizations/{{ org.url_prefix }}/innerpubrepo/unset/{{ repo.props.repo_id }}" class="cancel-share op">{% trans "Unshare"%}</a>
 	      {% endif %}
diff --git a/urls.py b/urls.py
index de82d587b5..ed50a39f9e 100644
--- a/urls.py
+++ b/urls.py
@@ -35,7 +35,7 @@ urlpatterns = patterns('',
     (r'^repo/create/$', repo_create),
     (r'^repo/upload_check/$', validate_filename),
     (r'^repo/file_rename/$', repo_rename_file),
-    (r'^repo/unsetinnerpub/(?P<repo_id>[-0-9a-f]{36})/$', unset_inner_pub_repo),
+    url(r'^repo/unsetinnerpub/(?P<repo_id>[-0-9a-f]{36})/$', unsetinnerpub, name='unsetinnerpub'),
     url(r'^repo/set_password/$', repo_set_password, name="repo_set_password"),
     url(r'^repo/revert_file/(?P<repo_id>[-0-9a-f]{36})/$', repo_revert_file, name='repo_revert_file'),
     url(r'^repo/revert_dir/(?P<repo_id>[-0-9a-f]{36})/$', repo_revert_dir, name='repo_revert_dir'),
diff --git a/views.py b/views.py
index 386d58d9d3..e1e95be29a 100644
--- a/views.py
+++ b/views.py
@@ -1177,13 +1177,17 @@ def public_repo_create(request):
                                       content_type=content_type)
 
 @login_required
-def unset_inner_pub_repo(request, repo_id):
+def unsetinnerpub(request, repo_id):
+    repo = get_repo(repo_id)
+    if not repo:
+        messages.error(request, _('Failed to unshare library. Library does not exist.'))
+        return HttpResponseRedirect(reverse('share_admin'))
+
     try:
         unset_inner_pub_repo(repo_id)
-        messages.success(request, _('Operation successful'))
+        messages.success(request, _('Unshare "%s" successfully.' % repo.name))
     except SearpcError:
-        messages.error(request, _('Operation failed'))
-
+        messages.error(request, _('Failed to unshare "%s".' % repo.name))
     return HttpResponseRedirect(reverse('share_admin'))
 
 @login_required