From f6136872275ed328c26eb5ac5a08882738dbe5ec Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 23 May 2018 09:34:48 +0800
Subject: [PATCH 1/2]  * Todo name is required.

---
 module/todo/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 10e7504fc9..dc81d2eb05 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -95,8 +95,8 @@
         <tr>
           <th><?php echo $lang->todo->name;?></th>
           <td colspan='2'>
-            <div class='nameBox'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
             <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
+            <div class='nameBox required'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
           </td>
         </tr>  
         <tr>

From c7f590821ba75796fed7b343cdea03cad2a141a6 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 23 May 2018 09:47:40 +0800
Subject: [PATCH 2/2]  * Finish task #4296.

---
 module/action/lang/en.php            | 1 +
 module/action/lang/zh-cn.php         | 1 +
 module/my/view/dynamic.html.php      | 6 ++++++
 module/product/view/dynamic.html.php | 7 +++++++
 module/project/view/dynamic.html.php | 6 ++++++
 module/user/view/dynamic.html.php    | 6 ++++++
 6 files changed, 27 insertions(+)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 21bd9540c1..1199c1ba58 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -34,6 +34,7 @@ $lang->action->original       = 'Original Format';
 $lang->action->confirmHideAll = 'Do you want to hide all the records?';
 $lang->action->needEdit       = '%s that you want to restore exists. Please edit it.';
 $lang->action->historyEdit    = 'The history editor cannot be empty.';
+$lang->action->noDynamic      = 'No dynamic.';
 
 $lang->action->history = new stdclass();
 $lang->action->history->action = 'Link';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 5fd841c37c..6f9119d63e 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -34,6 +34,7 @@ $lang->action->original       = '原始格式';
 $lang->action->confirmHideAll = '您确定要全部隐藏这些记录吗？';
 $lang->action->needEdit       = '要还原%s的名称或代号已经存在，请编辑更改。';
 $lang->action->historyEdit    = '历史记录编辑不能为空。';
+$lang->action->noDynamic      = '暂无动态';
 
 $lang->action->history = new stdclass();
 $lang->action->history->action = '关联日志';
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index abf7fa4abe..ea956441fa 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -29,6 +29,7 @@
 </div>
 <div id="mainContent" class="main-content">
   <div id="dynamics">
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -59,6 +60,11 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
   </div>
   <?php if(!empty($firstAction)):?>
   <?php
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index ca45bdf890..54e8910e64 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -32,6 +32,7 @@
 </div>
 <div id="mainContent" class="main-content">
   <div id="dynamics">
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -62,6 +63,12 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
+
   </div>
   <?php if(!empty($firstAction)):?>
   <?php
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index ae23f065eb..4cd93d37d0 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -33,6 +33,7 @@
 
 <div id="mainContent" class="main-content">
   <div id="dynamics">
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -63,6 +64,11 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
   </div>
   <?php if(!empty($firstAction)):?>
   <?php
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index ebdeddeb18..13f5a6ec66 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -31,6 +31,7 @@
   </div>
 
   <div id="dynamics" class='main-content'>
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -61,6 +62,11 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
   </div>
   <?php if(!empty($firstAction)):?>
   <?php