From 7e7b2c68d5b1de828ecdd6205a91d89bbebc5c6d Mon Sep 17 00:00:00 2001
From: guohongze <guohongze@126.com>
Date: Fri, 10 May 2019 11:56:17 +0800
Subject: [PATCH] fix branch paging

---
 templates/branches/branch_list.html | 10 +++++-----
 templates/footer.html               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/branches/branch_list.html b/templates/branches/branch_list.html
index 9fca90c4..37787383 100644
--- a/templates/branches/branch_list.html
+++ b/templates/branches/branch_list.html
@@ -26,7 +26,7 @@
 
     <!-- Main content -->
     <section class="content">
-        <form action="" method="post" id="region_form">
+        <form action="" method="post" id="branch_form">
                 {% csrf_token %}
             <div class="box">
                 <div class="box-header">
@@ -37,11 +37,11 @@
 
                 <!-- /.box-header -->
                 <div class="box-body">
-                  <table class="table table-striped table-bordered" id="regionform">
+                  <table class="table table-striped table-bordered" id="branchform">
                       <thead>
                         <tr>
                             <th>
-                                <input id="checkall" type="checkbox" class="i-checks" name="checkall" value="checkall" data-editable='false' onclick="check_all('region_form')">
+                                <input id="checkall" type="checkbox" class="i-checks" name="checkall" value="checkall" data-editable='false' onclick="check_all('branch_form')">
                             </th>
                             <th>分支名称</th>
                             <th>分支地址</th>
@@ -56,8 +56,8 @@
                                     <td><input type="checkbox" id="id" class="i-checks" value="{{ branch.id }}" name="id" /></td>
                                     <td><a href="#"><li style="list-style-type:none" onclick="return popWin(this.value)" value="{{ branch.id }}">{{ branch.name }}</li></a> </td>
                                     <td>{{ branch.address }} </td>
-                                    <td>{{ branch.owner.phone }} </td>
                                     <td>{{ branch.owner.name }} </td>
+                                    <td>{{ branch.owner.phone }} </td>
                                     <td>
                                         <a id="branchedit" style="display: none; float:left; margin: auto;" href="{% url "branch_edit" branch.id %}"><span class="btn btn-sm btn-info">编辑</span></a>
                                         <a id="branchdel" style="display: none; float:left; margin: auto;" href="{% url "branch_del"%}?id={{ branch.id }}" onclick="return confirm('删除分支？')"><span class="btn btn-sm btn-danger ">删除</span></a>
@@ -77,7 +77,7 @@
 </div>
 <script>
   $(function () {
-    $('#regionform').DataTable({
+    $('#branchform').DataTable({
       "paging": true,
       "lengthChange": true,
       "searching": true,
diff --git a/templates/footer.html b/templates/footer.html
index 23f3e4c6..2e0e85e9 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,7 +3,7 @@
     <div class="pull-right hidden-xs">
     </div>
     <!-- Default to the left bar -->
-    <div>AdminSet v0.55.3    &nbsp;&nbsp;
+    <div>AdminSet v0.55.4    &nbsp;&nbsp;
     <a href="http://docs.adminset.cn" target="_blank">用户手册</a>
     </div>
   </footer>