Git 仓库打补丁

From 1208e72befe3fabaf53bb5831463c88e1ac68d78 Mon Sep 17 00:00:00 2001
From: Neelie <neelie.7@gmail.com>
Date: Wed, 28 Jun 2017 14:49:49 +0800
Subject: [PATCH] fix

---
 app/v/entity/view.php     | 4 ++--
 app/v/rel_entity/view.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/v/entity/view.php b/app/v/entity/view.php
index 797d64b..27b1406 100644
--- a/app/v/entity/view.php
+++ b/app/v/entity/view.php
@@ -16,7 +16,7 @@
 
     <div class="form-actions pure-u-1">
       <?php if (!$menu_conf['readonly']): ?>
-      <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?="?/$entity_type/edit/$uuid/$is_more"?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
+      <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?="?/$entity_type/edit/$uuid/$is_more"."&".rand()?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
       <?php endif ?>
       <?php if ($menu_conf['transfer'] && checkperm("$entity_type/transfer")): ?>
       <a href="javascript:;" data-transfer class="pure-button" ><span class="glyphicon glyphicon-share"></span> 移交</a>
@@ -52,7 +52,7 @@
     <div class="form-actions pure-u-1">
       <div>
 
-        <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?="?/$entity_type/edit/$uuid/$is_more"?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
+        <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?="?/$entity_type/edit/$uuid/$is_more"."&".rand()?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
         <?php if (!$is_more): ?>
         <a href="javascript:bconfirm('?/<?=seg(1)?>/del/<?=$uuid?>/','你确定要删除此项么?');" class="pure-button"><span class="glyphicon glyphicon-remove"></span> 删除 </a>
         <?php endif ?>
diff --git a/app/v/rel_entity/view.php b/app/v/rel_entity/view.php
index 1cd6a23..7528ee8 100644
--- a/app/v/rel_entity/view.php
+++ b/app/v/rel_entity/view.php
@@ -7,7 +7,7 @@
 
     <div class="form-actions pure-u-1">
       <?php if (!$menu_conf['readonly']): ?>
-      <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?=$base_url."edit/$rel_uuid/"?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
+      <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?=$base_url."edit/$rel_uuid/"."&".rand()?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
       <?php endif ?>
       <?php if (!seg(5)): ?>
       <button type="button" class="pure-button" data-print="<?=$base_url."print_it/$rel_uuid/"?>"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> 打印</button>
@@ -40,7 +40,7 @@
     <div class="form-actions pure-u-1">
       <div>
 
-        <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?=$base_url."edit/$rel_uuid/"?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
+        <a href="javascript:;" data-entity-edit='{"target": "#form", "url": "<?=$base_url."edit/$rel_uuid/"."&".rand()?>"}' class="pure-button pure-button-primary ladda-button" ><span class="glyphicon glyphicon-edit"></span> 编辑</a>
         <?php if (!$is_more): ?>
         <a href="javascript:bconfirm('<?=$base_url."del/$uuid/"?>','你确定要删除此项么?');" class="pure-button"><span class="glyphicon glyphicon-remove"></span> 删除 </a>
         <?php endif ?>
-- 
2.10.1

From dd9d768cbcbddf380bc382437b8900eaa7eb4943 Mon Sep 17 00:00:00 2001
From: Neelie <neelie.7@gmail.com>
Date: Wed, 28 Jun 2017 18:51:42 +0800
Subject: [PATCH] fix

---
 app/v/event/add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/v/event/add.php b/app/v/event/add.php
index d834508..ff2a902 100644
--- a/app/v/event/add.php
+++ b/app/v/event/add.php
@@ -76,7 +76,7 @@
       <?=$permission_check?>
 
       <div style="margin-top:10px;" class="pull-right">
-        <button type="submit" onclick="if ($('#addEventForm').valid()) {$(this).attr('disabled', true);$('#addEventForm').submit()};" class="pure-button pure-button-primary"><span class="glyphicon glyphicon-ok"></span> 提交</button>
+        <button type="submit" class="pure-button pure-button-primary"><span class="glyphicon glyphicon-ok"></span> 提交</button>
         <button type="button" class="pure-button cancel-button"><span class="glyphicon glyphicon-remove"></span> 取消</button>
       </div>
     </fieldset>
-- 
2.10.1