Signed-off-by: zry <admin@z-touhou.org>

templates/home/post.bk.list.html

@@ -2,6 +2,13 @@
 {% load authperm %}
 {% load crypto %}
 {% load staticres %}
+{% load setvar %}
+
+{% if adminmode %}
+	{% setvar rfm = "a" %}
+{% else %}
+	{% setvar rfm = "w" %}
+{% endif %}
 
 {% block title %}
 {% if adminmode %}
@@ -92,14 +99,14 @@
 			<td>{{i.blogcomment_set.count}}</td>
 			<td>
 				<td class="host_buttom">
-					<a class="btn btn-primary btn-xs" href="{% url 'pichublog_postedit' i.id %}">编辑内容</a>
-					<a class="btn btn-success btn-xs" href="{% url 'pichublog_postgrant' i.id %}">权限设置</a>
+					<a class="btn btn-primary btn-xs" href="{% url 'pichublog_postedit' i.id %}?rfm={{rfm}}">编辑内容</a>
+					<a class="btn btn-success btn-xs" href="{% url 'pichublog_postgrant' i.id %}?rfm={{rfm}}">权限设置</a>
 					{% if i.hidden %}
-						<a class="btn btn-info btn-xs" href="{% url 'pichublog_posthid' i.id %}?val=false">取消隐藏</a>
+						<a class="btn btn-info btn-xs" href="{% url 'pichublog_posthid' i.id %}?val=false&rfm={{rfm}}">取消隐藏</a>
 					{% else %}
-						<a class="btn btn-warning btn-xs" href="{% url 'pichublog_posthid' i.id %}?val=true">隐藏</a>
+						<a class="btn btn-warning btn-xs" href="{% url 'pichublog_posthid' i.id %}?val=true&rfm={{rfm}}">隐藏</a>
 					{% endif %}
-					<a class="btn btn-danger btn-xs" href="{% url 'pichublog_postdel' i.id %}?confirmcode={% inthash i.id %}" onclick="return confirm('删除后不可恢复，是否确认删除？')">删除</a>
+					<a class="btn btn-danger btn-xs" href="{% url 'pichublog_postdel' i.id %}?confirmcode={% inthash i.title %}&rfm={{rfm}}" onclick="return confirm('删除后不可恢复，是否确认删除？')">删除</a>
 				</td>
 			</td>
 		</tr>

templates/home/post.edit.html

@@ -18,6 +18,7 @@
 <form class="form-horizontal" role="form" action="" method="POST" >
 	{% csrf_token %}
     {% for item in form %}
+    <input type="hidden" name="rfm" value="{{rfm}}">
 	<div class="form-group">
 		<label class="control-label col-md-1">{{item.label}}</label>
 		<div class="col-md-11">{{item}}</div>

views/posts.py

@@ -6,7 +6,7 @@ from django.shortcuts import render_to_response,RequestContext
 from django.core.cache import get_cache
 from django.core.urlresolvers import reverse
 from django.contrib import messages
-from siteutil.DataConvert import str2int,CheckPOST,str2long,BigIntUniqueID,CacheConfGet
+from siteutil.DataConvert import str2int,CheckPOST,str2long,BigIntUniqueID,CacheConfGet,MakeSummary
 from siteutil.CommonPaginator import SelfPaginator
 from siteutil.CommonFilter import CommonFilter,FilterCondition
 from siteutil.htmlutil import renderMarkdownSafety
@@ -227,12 +227,16 @@ def PostEdit(request,ID):
 			nbp.rendered = True
 			nbp.save()
 			form.save_m2m()
-			return HttpResponseRedirect(reverse('pichublog_postwbklist'))
+			if request.REQUEST.get("rfm") == "w":
+				return HttpResponseRedirect(reverse('pichublog_postwbklist'))
+			else:
+				return HttpResponseRedirect(reverse('pichublog_postabklist'))
 	else:
 		form = EditPostForm(instance=bpo)
 	kwvars = {
 		"request":request,
 		'form':form,
+		'rfm':request.REQUEST.get("rfm"),
 	}
 	return render_to_response('home/post.edit.html',kwvars,RequestContext(request))
 
@@ -258,6 +262,14 @@ def PostHidden(request,ID):
 		"randposts":BlogPost.objects.all().order_by('?')[:5],
 		}
 		return render_to_response('home/post.err.html',kwvars,RequestContext(request))
+	if not "val" in request.GET.keys():
+		return HttpResponse("Err Request Arguments")
+	bset = (request.GET['val']=="true")
+	bpo.hidden = bset
+	if request.REQUEST.get("rfm") == "w":
+		return HttpResponseRedirect(reverse('pichublog_postwbklist'))
+	else:
+		return HttpResponseRedirect(reverse('pichublog_postabklist'))
 
 def PostDel(request,ID):
 	try: