rabin 7 years ago
parent
commit
837873ff19
2 changed files with 19 additions and 16 deletions
  1. 2 2
      service.py
  2. 17 14
      web.py

+ 2 - 2
service.py

@@ -10,7 +10,7 @@ from demeter.core import *
 class Service(object):
 
 	# 获取某个model下的列表数据
-	def list(self, name, state = True, search=None, page=False, order='cdate desc'):
+	def list(self, name, state = True, search=None, page=False, order='cdate desc', limit = '0,100'):
 		model = self.model(name)
 		model.state = state
 		if search:
@@ -26,7 +26,7 @@ class Service(object):
 						self.assgin(model, key[0], value, method)
 					else:
 						self.assgin(model, key, value)
-		data = model.select(page=page, order=order)
+		data = model.select(page=page, order=order, limit=limit)
 		return data
 
 	# 获取某个model下的数据

+ 17 - 14
web.py

@@ -14,23 +14,26 @@ import tornado.httpserver
 
 class Base(tornado.web.RequestHandler):
 	def initialize(self):
-		self.data = {}
+		self.assign()
 		self.page()
 		self.cookie()
 		self.setting()
-		self.assign()
 
 	def get_current_user(self):
 		return self.get_secure_cookie(self.KEYS[0])
 
 	def assign(self):
+		self.data = {}
 		self.data['setting'] = Demeter.config['setting']
+		self.data['base'] = Demeter.config['base']
 		
 	def cookie(self):
 		for key in self.KEYS:
 			cookie = None
-			if key in Demeter.config['base']:
-				cookie = Demeter.config['base'][key]
+			"""
+			if key in self.data['base']:
+				cookie = self.data['base'][key]
+			"""
 			if not cookie:
 				cookie = self.get_secure_cookie(key)
 				#cookie = self.get_cookie(key)
@@ -38,11 +41,11 @@ class Base(tornado.web.RequestHandler):
 				value = self.input(key)
 				if value:
 					#self.set_secure_cookie(key, value)
-					Demeter.config['setting'][key] = value
+					self.data['setting'][key] = value
 				else:
-					Demeter.config['setting'][key] = 0
+					self.data['setting'][key] = 0
 			else:
-				Demeter.config['setting'][key] = cookie
+				self.data['setting'][key] = cookie
 
 	def page(self):
 		Demeter.config['page'] = {}
@@ -83,8 +86,8 @@ class Base(tornado.web.RequestHandler):
 	def common(self, **kwd):
 		self.data['common'] = kwd
 		self.data['common']['argvs'] = ''
-		if Demeter.config['setting']['farm'] > 0:
-			farm = str(Demeter.config['setting']['farm'])
+		if self.data['setting']['farm'] > 0:
+			farm = str(self.data['setting']['farm'])
 			self.data['common']['argvs'] = '&farm=' + farm + '&search_farm_id-select-=' + farm
 
 	def commonView(self, name):
@@ -101,8 +104,8 @@ class Base(tornado.web.RequestHandler):
 			kwd['id'] = id
 		if kwd:
 			self.data['info'] = self.service('common').one(model, **kwd)
-		if not self.data['info'] and Demeter.config['setting']['farm'] > 0:
-			self.data['info']['farm_id'] = Demeter.config['setting']['farm']
+		if not self.data['info'] and self.data['setting']['farm'] > 0:
+			self.data['info']['farm_id'] = self.data['setting']['farm']
 
 	def commonUpdate(self, model, msg='', id=0, **kwd):
 		if not self.data['auth']:
@@ -133,9 +136,9 @@ class Base(tornado.web.RequestHandler):
 			self.out('yes', {'state':state})
 
 	def log(self, model, method, data):
-		if 'admin' in Demeter.config['setting'] and Demeter.config['setting']['admin'] > 0:
+		if 'admin' in self.data['setting'] and self.data['setting']['admin'] > 0:
 			insert = {}
-			insert['admin_id'] = Demeter.config['setting']['admin']
+			insert['admin_id'] = self.data['setting']['admin']
 			insert['model'] = model
 			insert['method'] = method
 			insert['data'] = json.dumps(data)
@@ -145,7 +148,7 @@ class Base(tornado.web.RequestHandler):
 		if not self.data['auth']:
 			self.auth()
 		else:
-			self.render(name, data=self.data)
+			self.render(name, data=self.data, Demeter=Demeter)
 
 	def auth(self):
 		self.out('您没有权限')