Merge branch 'master' of github.com:easysoft/zentaopms

module/task/control.php

@@ -628,6 +628,11 @@ class task extends control
                     }
                 }
             }
+            if($this->cookie->reload2Parent)
+            {
+                setcookie('reload2Parent', false, 0, $this->config->webRoot);
+                die(js::reload('parent'));
+            }
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));

module/task/js/recordestimate.js

@@ -8,5 +8,25 @@ $(function()
         });
         if(left === '0') return confirm(confirmRecord);
     });
-})
 
+    $('#recordForm .showinonlybody').each(function()
+    {
+        $(this).click(function()
+        {
+            var saveRecord = false;
+            $('#recordForm .form-date').each(function()
+            {
+                if($(this).val() !== '')
+                {
+                    saveRecord = confirm(confirmSaveRecord);
+                    return false;
+                }
+            });
+            if(saveRecord)
+            {
+                $.cookie('reload2Parent', true, {path:config.webRoot});
+                return false;
+            }
+        });
+    });
+})

module/task/lang/en.php

@@ -144,6 +144,7 @@ $lang->task->remindBug             = "This task from Bug, update the Bug:%s or n
 $lang->task->confirmChangeProject  = "Change {$lang->projectCommon} will change module, story and assignedTo also, are you sure?";
 $lang->task->confirmFinish         = '"Left" is zero, this task will be done. Are you sure?';
 $lang->task->confirmRecord         = '"Left" is zero, this task will be done. Are you sure?';
+$lang->task->confirmSaveRecord     = 'Please save the estimate record which has not been saved.';
 $lang->task->commentActions        = '%s. %s, commented by<strong>%s</strong>.';
 
 $lang->task->error = new stdclass();

module/task/lang/zh-cn.php

@@ -144,6 +144,7 @@ $lang->task->remindBug             = "该任务为Bug转化得到，是否更新
 $lang->task->confirmChangeProject  = "修改{$lang->projectCommon}会导致相应的所属模块、相关需求和指派人发生变化，确定吗？";
 $lang->task->confirmFinish         = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
 $lang->task->confirmRecord         = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
+$lang->task->confirmSaveRecord     = '您有尚未保存的工时记录，请先将其保存。';
 $lang->task->commentActions        = '%s. %s, 由 <strong>%s</strong> 添加备注。';
 
 $lang->task->error = new stdclass();

module/task/view/recordestimate.html.php

@@ -12,7 +12,8 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
+<?php js::set('confirmRecord',     $lang->task->confirmRecord);?>
+<?php js::set('confirmSaveRecord', $lang->task->confirmSaveRecord);?>
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>