Bugfix: remove fetched repo correctly on myhome page

templates/myhome.html

@@ -15,7 +15,7 @@
 </div>
 {% endif %}
 
-<h3>我的同步目录</h3>
+<h3>我拥有的同步目录</h3>
 {% if owned_repos %}
 <table class="repo-list default">
     <tr>
@@ -38,7 +38,7 @@
 <p>暂无</p>
 {% endif %}
 
-<h3>我用过的同步目录</h3>
+<h3>我获取的同步目录</h3>
 {% if fetched_repos %}
 <table class="repo-list default">
     <tr>
@@ -53,7 +53,7 @@
         <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}">{{ repo.props.name }}</a></td>
         <td>{{ repo.props.id }}</td>
         <td>{{ repo.props.desc }}</td>
-        <td><a href="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/">删除</a></td>
+        <td><a href="{{ SITE_ROOT }}repo/removefetched/{{ user.user_id }}/{{ repo.props.id }}/">删除</a></td>
     </tr>
     {% endfor %}
 </table>

templates/useradmin.html

@@ -32,7 +32,7 @@
         <td>{{ user.profile.ccnet_user_id }}</td>
         <td>
             {% for role in user.role_list %}
-            {{ role }} <button data="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}" class="role-delete-btn">删除</button><br /> 
+            {{ role }} <!--<button data="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}" class="role-delete-btn">删除</button>--><br /> 
             {% endfor %}
         </td>
         {% else %}
@@ -41,7 +41,7 @@
         {% endif %}
         <td>
           {% if user.profile %}
-          <button class="add-role-btn" userid="{{ user.profile.ccnet_user_id }}" email="{{ user.email }}">添加角色</button>
+<!--          <button class="add-role-btn" userid="{{ user.profile.ccnet_user_id }}" email="{{ user.email }}">添加角色</button> -->
           {% endif %}
           <button class="remove-user-btn" userid="{{ user.id }}">删除用户</button>
         </td>

urls.py

@@ -5,7 +5,7 @@ from django.views.generic.simple import direct_to_template
 from seahub.views import root, peers, groups, myhome, \
     repo, group, modify_token, remove_repo, seafadmin, useradmin, \
     role_add, role_remove, activate_user, user_add, user_remove, \
-    ownerhome
+    ownerhome, remove_fetched_repo
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
@@ -31,6 +31,7 @@ urlpatterns = patterns('',
     (r'^repo/(?P<repo_id>[^/]+)/$', repo),
     (r'^repo/token/modify/(?P<repo_id>[^/]+)/$', modify_token),
     (r'^repo/remove/(?P<repo_id>[^/]+)/$', remove_repo),
+    (r'^repo/removefetched/(?P<user_id>[^/]+)/(?P<repo_id>[^/]+)/$', remove_fetched_repo),
 
     (r'^seafadmin/$', seafadmin),
     url(r'^useradmin/$', useradmin, name='useradmin'),

views.py

@@ -144,6 +144,12 @@ def remove_repo(request, repo_id):
     seafserv_threaded_rpc.remove_repo(repo_id)
     return HttpResponseRedirect(request.META['HTTP_REFERER'])
     
+@login_required
+def remove_fetched_repo(request, repo_id, user_id):
+    if user_id and repo_id:
+        seafserv_threaded_rpc.remove_fetched_repo (user_id, repo_id)
+        
+    return HttpResponseRedirect(request.META['HTTP_REFERER'])
 
 @login_required
 def myhome(request):
@@ -156,7 +162,7 @@ def myhome(request):
         owned_repos = seafserv_threaded_rpc.list_owned_repos(user_id)
         quota_usage = seafserv_threaded_rpc.get_user_quota_usage(user_id)
         fetched_repos = seafserv_threaded_rpc.list_fetched_repos(user_id)
-
+        
     return render_to_response('myhome.html', {
             "owned_repos": owned_repos,
             "quota_usage": quota_usage,