Fix bug in HTTP_REFERER

group/views.py

@@ -66,7 +66,7 @@ def group_remove(request, group_id):
         return go_error(request, e.msg)
 
     if request.GET.get('src', '') == 'groupadmin':
-        return HttpResponseRedirect(request.META['HTTP_REFERER'])
+        return HttpResponseRedirect(reverse('group_admin'))
     else:
         return HttpResponseRedirect(reverse('group_list', args=[]))
 

notifications/views.py

@@ -15,7 +15,8 @@ def notification_close(request, note_id):
     topinfo_close = request.COOKIES.get('topinfo', '')
     topinfo_close += note_id
  
-    res = HttpResponseRedirect(request.META['HTTP_REFERER'])
+    next = request.GET.get('next', '/')
+    res = HttpResponseRedirect(next)
     res.set_cookie("topinfo", topinfo_close, max_age=14*24*60*60)
  
     return res

profile/views.py

@@ -1,3 +1,4 @@
+from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import Context, RequestContext
@@ -28,4 +29,4 @@ def logout_relay(request):
     except SearpcError, e:
         return go_error(request, e.msg)
 
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    return HttpResponseRedirect(reverse('list_userids'))

settings.py

@@ -127,7 +127,7 @@ REGISTRATION_SEND_MAIL = False
 HTTP_SERVER_ROOT = "http://localhost:8082"
 
 # ccnet-applet address and port, used in repo download
-CCNET_APPLET_ROOT = "http://localhost:8081"
+CCNET_APPLET_ROOT = "http://localhost:13420"
 
 SEAFILE_VERSION = '0.9.2'
 

templates/base.html

@@ -16,7 +16,7 @@
     {% if request.user.is_authenticated and request.cur_note %}
     <div id="info-bar">
       <span class="info">{{ request.cur_note.message|urlize }}</span>
-      <a href="{{ SITE_ROOT }}notification/close/{{ request.cur_note.id }}/"><span class="close"></span></a>
+      <a href="{{ SITE_ROOT }}notification/close/{{ request.cur_note.id }}/?next={{ request.path }}"><span class="close"></span></a>
     </div>
     {% endif %}
     

templates/myhome.html

@@ -66,7 +66,7 @@
         <td>
             <img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.props.id }}" class="download-btn vh" title="下载" alt="下载" />
             <img src="{{ MEDIA_URL }}img/share-20.png" data="{{ repo.props.id }}" class="repo-share-btn vh" title="共享" alt="共享" />
-            <img src="{{ MEDIA_URL }}img/delete-20.png" data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn vh" title="删除" alt="删除" />
+            <img src="{{ MEDIA_URL }}img/delete-20.png" data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" class="repo-delete-btn vh" title="删除" alt="删除" />
         </td>
     </tr>
     {% endfor %}

templates/repos.html

@@ -16,7 +16,7 @@
         <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
         <td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td>
         <td>{{ repo.props.desc }}</td>
-        <td><button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn">删除</button></td>
+        <td><button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" class="repo-delete-btn">删除</button></td>
     </tr>
     {% endfor %}
 </table>

templates/userinfo.html

@@ -27,7 +27,7 @@
         <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
         <td>{{ repo.props.desc }}</td>
         <td>
-        <button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn">删除</button>
+        <button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" class="repo-delete-btn">删除</button>
         </td>
     </tr>
     {% endfor %}

urls.py

@@ -4,8 +4,8 @@ from django.views.generic.simple import direct_to_template
 
 from seahub.views import root, peers, myhome, \
     repo, repo_history, modify_token, remove_repo, seafadmin, useradmin, \
-    role_add, role_remove, activate_user, user_add, user_remove, \
-    ownerhome, remove_fetched_repo, repo_history_dir, repo_history_revert, \
+    activate_user, user_add, user_remove, \
+    ownerhome, repo_history_dir, repo_history_revert, \
     user_info, repo_set_access_property, repo_access_file, \
     repo_add_share, repo_list_share, repo_remove_share, repo_download, \
     seafile_access_check, back_local, group_admin, repo_history_changes
@@ -54,8 +54,8 @@ urlpatterns = patterns('',
     url(r'^useradmin/$', useradmin, name='useradmin'),
     (r'^useradmin/add/$', user_add),
     (r'^useradmin/info/(?P<email>[^/]+)/$', user_info),
-    (r'^useradmin/(?P<user_id>[^/]+)/role/add/$', role_add),
-    (r'^useradmin/(?P<user_id>[^/]+)/role/remove/$', role_remove),
+#    (r'^useradmin/(?P<user_id>[^/]+)/role/add/$', role_add),
+#    (r'^useradmin/(?P<user_id>[^/]+)/role/remove/$', role_remove),
     (r'^useradmin/(?P<user_id>[^/]+)/user/remove/$', user_remove),
     (r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user),
 

views.py

@@ -531,14 +531,15 @@ def remove_repo(request, repo_id):
         return go_permission_error(request, u'删除同步目录失败')
     
     seafserv_threaded_rpc.remove_repo(repo_id)
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    next = request.GET.get('next', '/')
+    return HttpResponseRedirect(next)
     
-@login_required
-def remove_fetched_repo(request, user_id, repo_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 remove_fetched_repo(request, user_id, repo_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):
@@ -601,11 +602,10 @@ def ownerhome(request, owner_name):
 
 @login_required
 def repo_set_access_property(request, repo_id):
-    if repo_id:
     ap = request.GET.get('ap', '')
     seafserv_threaded_rpc.repo_set_access_property(repo_id, ap)
         
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    return HttpResponseRedirect(reverse('repo', args=[repo_id]))
 
 def repo_access_file(request, repo_id, obj_id):
     if repo_id:
@@ -815,7 +815,12 @@ def repo_remove_share(request):
         from seahub.group.views import group_unshare_repo
         group_unshare_repo(request, repo_id, group_id_int, from_email)
 
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])        
+    referer = request.META.get('HTTP_REFERER', None)
+    if not referer:
+        referer = 'repo_list_share'
+        return HttpResponseRedirect(reverse(referer))
+    else:
+        return HttpResponseRedirect(referer)
     
 @login_required
 def mypeers(request):
@@ -916,29 +921,28 @@ def user_info(request, email):
             },
         context_instance=RequestContext(request))
 
-@login_required
-def role_add(request, user_id):
-    if not request.user.is_staff:
-        raise Http404
+#@login_required
+#def role_add(request, user_id):
+#    if not request.user.is_staff:
+#        raise Http404
+# 
+#    if request.method == 'POST':
+#        role = request.POST.get('role', '')
+#        if role and len(role) <= 16:
+#            ccnet_rpc.add_role(user_id, role)
+# 
+#    return HttpResponseRedirect(request.META['HTTP_REFERER'])
 
-    if request.method == 'POST':
-        role = request.POST.get('role', '')
-        if role and len(role) <= 16:
-            ccnet_rpc.add_role(user_id, role)
-
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
-
-
-@login_required
-def role_remove(request, user_id):
-    if not request.user.is_staff:
-        raise Http404
-
-    role = request.REQUEST.get('role', '')
-    if role and len(role) <= 16:
-        ccnet_rpc.remove_role(user_id, role)
-
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+#@login_required
+#def role_remove(request, user_id):
+#    if not request.user.is_staff:
+#        raise Http404
+# 
+#    role = request.REQUEST.get('role', '')
+#    if role and len(role) <= 16:
+#        ccnet_rpc.remove_role(user_id, role)
+# 
+#    return HttpResponseRedirect(request.META['HTTP_REFERER'])
 
 @login_required
 def user_remove(request, user_id):
@@ -950,7 +954,7 @@ def user_remove(request, user_id):
     ccnetuser = get_ccnetuser(userid=int(user_id))
     ccnetuser.delete()
     
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    return HttpResponseRedirect(reverse('useradmin'))
 
 @login_required
 def activate_user(request, user_id):
@@ -963,7 +967,7 @@ def activate_user(request, user_id):
     ccnetuser.is_active = True
     ccnetuser.save()
 
-    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    return HttpResponseRedirect(reverse('useradmin'))
 
 @login_required
 def user_add(request):