Merge pull request #313 from newpanjing/dev

Dev
newpanjing · Sep 26, 2020 · 0808ffa · 0808ffa
2 parents c6a64ea + 5c2e034
commit 0808ffa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -2,4 +2,4 @@
 
 
 def get_version():
-    return '2020.9'
+    return '2020.9.26'
diff --git a/simpleui/templates/admin/pagination.html b/simpleui/templates/admin/pagination.html
@@ -9,7 +9,7 @@
                 :current-page="{{ cl.page_num }}+1"
                 :page-size="{{ cl.list_per_page }}"
                 layout="total,prev, pager, next, jumper"
-                :total="{{ cl.result_count }}">
+                :total="{{ cl.result_count|to_str }}">
         </el-pagination>
     {% endif %}
 </div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		def get_version():
		return '2020.9'
		return '2020.9.26'