Merge branch 'sprint/master_zhouxudong_17353' into 'master'

Sprint/master zhouxudong 17353

See merge request easycorp/zentaopms!2953

module/todo/js/view.js

@@ -41,8 +41,13 @@ $(function()
     {
         var onlybody  = config.onlybody == 'yes';
         var productID = $('#bugProduct').val();
-        var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, onlybody);
+        if(!productID)
+        {
+            alert(selectProduct);
+            return false;
+        }
 
+        var link = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, onlybody);
         if(!onlybody) window.parent.$.apps.open(link, 'qa');
         if(onlybody) location.href = link;
     })

module/todo/lang/en.php

@@ -113,6 +113,7 @@ $lang->todo->noTodo         = 'No todos of this type.';
 $lang->todo->noAssignedTo   = "The AssignedTo should not be empty.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 $lang->todo->today          = 'Todo Today';
+$lang->todo->selectProduct  = "Please select a product";
 
 $lang->todo->periods['all']             = 'Assigned To Yourself';
 $lang->todo->periods['before']          = 'Unfinished';

module/todo/lang/zh-cn.php

@@ -113,6 +113,7 @@ $lang->todo->noTodo         = '该类型没有待办事务';
 $lang->todo->noAssignedTo   = '被指派人不能为空';
 $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。';
 $lang->todo->today          = '今日待办';
+$lang->todo->selectProduct  = "请选择产品";
 
 $lang->todo->periods['all']             = '指派自己';
 $lang->todo->periods['before']          = '未完';

module/todo/view/view.html.php

@@ -209,14 +209,6 @@
         <h4 class="modal-title"><?php echo $lang->execution->selectExecution;?></h4>
       </div>
       <div class="modal-body">
-        <?php if((empty($projects) and $config->systemMode == 'new') or (empty($executions) and $config->systemMode == 'classic')):?>
-        <div class="table-empty-tip">
-          <p>
-            <span class="text-muted"><?php echo $lang->project->empty;?></span>
-            <?php echo html::a("javascript:" . ($config->systemMode == 'new' ? "createProject()" : "createExecution()"), "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
-          </p>
-        </div>
-        <?php else:?>
         <table align='center' class='table table-form'>
           <?php if($config->systemMode == 'new'):?>
           <tr>
@@ -232,7 +224,6 @@
             <td colspan='2' class='text-center'><?php echo html::commonButton($lang->todo->reasonList['task'], "id='toTaskButton'", 'btn btn-primary');?></td>
           </tr>
         </table>
-        <?php endif;?>
       </div>
     </div>
   </div>
@@ -271,14 +262,6 @@
         <h4 class="modal-title"><?php echo $lang->product->select;?></h4>
       </div>
       <div class="modal-body">
-        <?php if(empty($projects) and $config->systemMode == 'new'):?>
-        <div class="table-empty-tip">
-          <p>
-            <span class="text-muted"><?php echo $lang->project->empty;?></span>
-            <?php echo html::a("javascript:createProject()", "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
-          </p>
-        </div>
-        <?php else:?>
         <table align='center' class='table table-form'>
           <?php if($config->systemMode == 'new'):?>
           <tr>
@@ -294,13 +277,13 @@
             <td colspan='2' class='text-center'><?php echo html::commonButton($lang->todo->reasonList['bug'], "id='toBugButton'", 'btn btn-primary');?></td>
           </tr>
         </table>
-        <?php endif;?>
       </div>
     </div>
   </div>
 </div>
 <?php js::set('todoID', $todo->id);?>
 <?php js::set('selectExecution', $lang->execution->selectExecution);?>
+<?php js::set('selectProduct', $lang->todo->selectProduct);?>
 <script>
 $(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
 </script>