edit

demeter/admin/templates/theme/set.html

@@ -27,7 +27,7 @@
                         <input type="hidden" name="url" id="url" value="{% block url %}{% end %}" />
                         <input type="hidden" name="project" id="project" value="ai" />
                         <input type="hidden" name="table" id="table" value="col" />
-                        <input type="hidden" name="id" id="id" value="{% if data['info'] and 'id' in data['info'] and data['info']['id'] > 0 %}{{data['info']['id']}}{% end %}" />
+                        <input type="hidden" name="id" id="id" value="{% if data['info'] and 'id' in data['info'] and data['info']['id'] %}{{data['info']['id']}}{% end %}" />
                         <iframe id="f1" name="f1" style="display:none;"></iframe>
                         {% block form %}
                         <div class="layui-form-item">

demeter/admin/templates/theme/update.html

@@ -15,7 +15,7 @@
             <input type="hidden" name="url" id="url" value="{% block url %}{% end %}" />
             <input type="hidden" name="project" id="project" value="ai" />
             <input type="hidden" name="table" id="table" value="col" />
-            <input type="hidden" name="id" id="id" value="{% if data['info'] and 'id' in data['info'] and data['info']['id'] > 0 %}{{data['info']['id']}}{% end %}" />
+            <input type="hidden" name="id" id="id" value="{% if data['info'] and 'id' in data['info'] and data['info']['id'] %}{{data['info']['id']}}{% end %}" />
             <iframe id="f1" name="f1" style="display:none;"></iframe>
 
                 {% block form %}

demeter/core.py

@@ -283,6 +283,13 @@ class Demeter(object):
 		else:
 			return hashlib.sha1(value.encode("utf-8")).hexdigest()
 
+	@classmethod
+	def range(self, length):
+		if self.checkPy3():
+			return range(length)
+		else:
+			return xrange(length)
+
 	@classmethod
 	def rand(self, length = 4):
 		module = self.getObject('random')
@@ -290,7 +297,8 @@ class Demeter(object):
 		salt = ''
 		chars = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789'
 		len_chars = len(chars) - 1
-		for i in range(length):
+		l = Demeter.range(length)
+		for i in l:
 			salt += chars[rand(0, len_chars)]
 		return salt
 
@@ -347,7 +355,8 @@ class Demeter(object):
 		row = value.replace('-', '')
 		code = ''
 		hash = [x for x in "0123456789-abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ"]
-		for i in xrange(10):
+		l = Demeter.range(10)
+		for i in l:
 			enbin = "%012d" % int(bin(int(row[i * 3] + row[i * 3 + 1] + row[i * 3 + 2], 16))[2:], 10)
 			code += (hash[int(enbin[0:6], 2)] + hash[int(enbin[6:12], 2)])
 		return code

demeter/web.py

@@ -82,9 +82,15 @@ class Base(tornado.web.RequestHandler):
 		for key in data:
 			if 'search_' in key:
 				index = key.replace('search_', '')
+				i = 0
+				for a in data[key]:
+					data[key][i] = a.decode()
 				self.data['search'][index] = ",".join(data[key])
 			if 'update_' in key:
 				index = key.replace('update_', '')
+				i = 0
+				for a in data[key]:
+					data[key][i] = a.decode()
 				self.data['update'][index] = ",".join(data[key])
 
 	def input(self, key, value=None):