diff --git a/templates/myhome.html b/templates/myhome.html
index f48d99738e..2c17a5d7b9 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -15,7 +15,7 @@
{% endif %}
-
我的同步目录
+我拥有的同步目录
{% if owned_repos %}
@@ -38,7 +38,7 @@
暂无
{% endif %}
-我用过的同步目录
+我获取的同步目录
{% if fetched_repos %}
diff --git a/templates/useradmin.html b/templates/useradmin.html
index 0cc995ea11..69ca6f081d 100644
--- a/templates/useradmin.html
+++ b/templates/useradmin.html
@@ -32,7 +32,7 @@
{{ user.profile.ccnet_user_id }} |
{% for role in user.role_list %}
- {{ role }}
+ {{ role }}
{% endfor %}
|
{% else %}
@@ -41,7 +41,7 @@
{% endif %}
{% if user.profile %}
-
+
{% endif %}
|
diff --git a/urls.py b/urls.py
index 29cefaf8af..aa747998fb 100644
--- a/urls.py
+++ b/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),
(r'^repo/token/modify/(?P[^/]+)/$', modify_token),
(r'^repo/remove/(?P[^/]+)/$', remove_repo),
+ (r'^repo/removefetched/(?P[^/]+)/(?P[^/]+)/$', remove_fetched_repo),
(r'^seafadmin/$', seafadmin),
url(r'^useradmin/$', useradmin, name='useradmin'),
diff --git a/views.py b/views.py
index 283ece0aae..ef471530bc 100644
--- a/views.py
+++ b/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,