修复分页函数一处BUG

controller/base.py

@@ -149,7 +149,7 @@ def pagenav(self, count, url, each, now,
 			_ret = u'<li><a class="am-link-muted" href="%s">首页</a></li><li class="am-disabled"><a href="#">...</a></li>%s' % (_url, _ret)
 		if now + 5 < page:
 			_url = url % page
-			_ret = u'%s<li class="am-disabled"><a href="#">...</a></li><li><a class="am-link-muted" href="%s%d">尾页</a></li>' % (_ret, _url)
+			_ret = u'%s<li class="am-disabled"><a href="#">...</a></li><li><a class="am-link-muted" href="%s">尾页</a></li>' % (_ret, _url)
 		if page <= 1:
 			_ret = ''
 		_ret = _pre + _ret + _end

controller/dashboard.py

@@ -17,7 +17,11 @@ def prepare(self):
 			self.redirect("/")
 
 	def render(self, template_name, **kwargs):
-		super(AdminHandler, self).render("admin/%s" % template_name, **kwargs)
+		if self.power == "admin":
+			render = "admin/%s" % template_name
+		else:
+			render = template_name
+		super(AdminHandler, self).render(render, **kwargs)
 
 	def get(self, *args, **kwargs):
 		action = args[0] if len(args) else "index"

controller/publish.py

@@ -173,10 +173,6 @@ class UploadHandler(BaseHandler):
 	def prepare(self):
 		super(UploadHandler, self).prepare()
 		self.orgname = ''
-		self.set_header("X-Frame-Options", "SAMEORIGIN")
-		self.set_header("Content-Security-Policy", "default-src 'self'; script-src 'self' 'unsafe-eval' "
-		                                           "'unsafe-inline'; connect-src 'self'; img-src 'self' data:; "
-		                                           "style-src 'self' 'unsafe-inline'; font-src 'self'; frame-src 'self';")
 
 	def check_xsrf_cookie(self):
 		return True
@@ -204,8 +200,6 @@ def post(self, *args, **kwargs):
 		except tornado.web.Finish, e:
 			pass
 		except:
-			import traceback
-			print traceback.print_exc()
 			self.end(False, u"参数错误")
 
 	def end(self, status, info, path = ""):