Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289

module/execution/lang/de.php

@@ -400,6 +400,7 @@ $lang->execution->errorLetterParent            = 'The begin cannot be less than
 $lang->execution->errorGreaterParent           = 'The end cannot be greater than the end of the parent stage to which it belongs：%s.';
 $lang->execution->errorNameRepeat              = 'Child stages of the same parent stage cannot have the same name.';
 $lang->execution->errorAttrMatch               = "Parent stage's attribute is [%s], the attribute needs to be consistent with the parent stage.";
+$lang->execution->errorLetterPlan              = "『%s』cannot be less than the plan start time『%s』。";
 $lang->execution->accessDenied                 = "Zugriff zu {$lang->executionCommon} verweigert!";
 $lang->execution->tips                         = 'Hinweis';
 $lang->execution->afterInfo                    = "{$lang->executionCommon} wurde erstellt. Als nächstes können Sie ";

module/execution/lang/en.php

@@ -400,6 +400,7 @@ $lang->execution->errorLetterParent            = 'The begin cannot be less than
 $lang->execution->errorGreaterParent           = 'The end cannot be greater than the end of the parent stage to which it belongs：%s.';
 $lang->execution->errorNameRepeat              = 'Child stages of the same parent stage cannot have the same name.';
 $lang->execution->errorAttrMatch               = "Parent stage's attribute is [%s], the attribute needs to be consistent with the parent stage.";
+$lang->execution->errorLetterPlan              = "『%s』cannot be less than the plan start time『%s』。";
 $lang->execution->accessDenied                 = "Your access to {$lang->executionCommon} is denied!";
 $lang->execution->tips                         = 'Note';
 $lang->execution->afterInfo                    = "{$lang->executionCommon} is created. Next you can ";

module/execution/lang/fr.php

@@ -400,6 +400,7 @@ $lang->execution->errorLetterParent            = 'The begin cannot be less than
 $lang->execution->errorGreaterParent           = 'The end cannot be greater than the end of the parent stage to which it belongs：%s.';
 $lang->execution->errorNameRepeat              = 'Child stages of the same parent stage cannot have the same name.';
 $lang->execution->errorAttrMatch               = "Parent stage's attribute is [%s], the attribute needs to be consistent with the parent stage.";
+$lang->execution->errorLetterPlan              = "『%s』cannot be less than the plan start time『%s』。";
 $lang->execution->accessDenied                 = "Votre accès au {$lang->executionCommon} est refusé ! Désolé.";
 $lang->execution->tips                         = 'Note';
 $lang->execution->afterInfo                    = "Le {$lang->executionCommon} a été créé avec succès ! Ensuite vous pouvez ";

module/execution/lang/zh-cn.php

@@ -400,6 +400,7 @@ $lang->execution->errorLetterParent            = '计划开始时间不能小于
 $lang->execution->errorGreaterParent           = '计划完成时间不能大于所属父阶段的计划完成时间：%s。';
 $lang->execution->errorNameRepeat              = '相同父阶段的子阶段名称不能相同';
 $lang->execution->errorAttrMatch               = "父阶段类型为[%s]，阶段类型需与父阶段一致";
+$lang->execution->errorLetterPlan              = "『%s』应当不小于计划开始时间『%s』。";
 $lang->execution->accessDenied                 = "您无权访问该{$lang->executionCommon}！";
 $lang->execution->tips                         = '提示';
 $lang->execution->afterInfo                    = "{$lang->executionCommon}添加成功，您现在可以进行以下操作：";

module/execution/model.php

@@ -881,7 +881,7 @@ class executionModel extends model
             {
                 if($executions[$executionID]->begin > $executions[$executionID]->end)
                 {
-                    dao::$errors["ends{$executionID}"][] = sprintf($this->lang->execution->ge, $executions[$executionID]->end, $executions[$executionID]->begin);
+                    dao::$errors["ends{$executionID}"][] = sprintf($this->lang->execution->errorLetterPlan, $executions[$executionID]->end, $executions[$executionID]->begin);
                 }
 
                 if($project and $executions[$executionID]->begin < $project->begin)

module/execution/view/taskkanban.html.php

@@ -103,7 +103,7 @@
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php $showDivider = false;?>
-        <?php if(isset($lang->execution->menu->story)):?>
+        <?php if(isset($lang->execution->menu->story) and $hasStoryButton):?>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe' data-width='80%'") . '</li>';?>
         <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>

module/story/js/common.js

@@ -20,7 +20,7 @@ $(function()
         $('#navbar .nav>li[data-id=story]>a').html($('#navbar .nav li.active [data-id=' + storyType + ']').text() + '<span class="caret"></span>');
     }
 
-    $('#saveButton').on('click', function()
+    $('#saveButton').on('click', function(e)
     {
         $('#saveButton').attr('type', 'submit').attr('disabled', true);
         $('#saveDraftButton').attr('disabled', true);
@@ -28,15 +28,16 @@ $(function()
         var storyStatus = !$('#reviewer').val() || $('#needNotReview').is(':checked') ? 'active' : 'reviewing';
         $('<input />').attr('type', 'hidden').attr('name', 'status').attr('value', storyStatus).appendTo('#dataform');
         $('#dataform').submit();
+        e.preventDefault();
 
         setTimeout(function()
         {
             $('#saveButton').attr('type', 'button').removeAttr('disabled');
             $('#saveDraftButton').removeAttr('disabled');
-        }, 1000);
+        }, 10000);
     });
 
-    $('#saveDraftButton').on('click', function()
+    $('#saveDraftButton').on('click', function(e)
     {
         $('#saveButton').attr('disabled', true);
         $('#saveDraftButton').attr('type', 'submit').attr('disabled', true);
@@ -46,12 +47,13 @@ $(function()
         if(typeof(page) !== 'undefined' && page == 'edit' && $('#status').val() == 'changing') storyStatus = 'changing';
         $('<input />').attr('type', 'hidden').attr('name', 'status').attr('value', storyStatus).appendTo('#dataform');
         $('#dataform').submit();
+        e.preventDefault();
 
         setTimeout(function()
         {
             $('#saveButton').removeAttr('disabled');
             $('#saveDraftButton').attr('type', 'button').removeAttr('disabled');
-        }, 1000);
+        }, 10000);
     });
 })