Merge branch 'sprint/master_zhouxudong_57848' into 'master'

Sprint/master zhouxudong 57848

See merge request easycorp/zentaopms!4085

module/todo/js/common.js

@@ -39,16 +39,14 @@ function loadList(type, id, defaultType, idvalue)
     if(moduleList.indexOf(type) !== -1)
     {
         link = createLink(type, objectsMethod[type], param);
-    }
 
-    if(moduleList.indexOf(type) !== -1)
-    {
         $.get(link, function(data, status)
         {
             if(data.length != 0)
             {
                 $(divClass).html(data).find('select').chosen();
-                if(config.currentMethod == 'edit' || type == 'feedback') $(divClass).html(data).find('select').val(idvalue).trigger('chosen:updated');
+                if(config.currentMethod == 'edit' || type == 'feedback') $(divClass).find('select').val(idvalue).trigger('chosen:updated');
+                if($(divClass + " select").val() == null) $(divClass + " select").attr("data-placeholder", noOptions.replace("%s", chosenType[type])).trigger('chosen:updated');
             }
             else
             {

module/todo/lang/de.php

@@ -84,6 +84,7 @@ $lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 $lang->todo->confirmBug   = 'Dieser Todo steht in Beziehung mit Bug #%s. Möchten Sie das bearbeiten?';
 $lang->todo->confirmTask  = 'Dieser Todo steht in Beziehung mit Task #%s， Möchten Sie das bearbeiten?';
 $lang->todo->confirmStory = 'Dieser Todo steht in Beziehung mit Story #%s， Möchten Sie das bearbeiten?';
+$lang->todo->noOptions    = 'You have no %s todo at the moment. Please reselect the Todo type.';
 
 $lang->todo->statusList['wait']   = 'Wartend';
 $lang->todo->statusList['doing']  = 'In Arbeit';

module/todo/lang/en.php

@@ -85,6 +85,7 @@ $lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 $lang->todo->confirmBug   = 'This Todo is linked to Bug #%s. Do you want to edit it?';
 $lang->todo->confirmTask  = 'This Todo is linked to Task #%s，Do you want to edit it?';
 $lang->todo->confirmStory = 'This Todo is linked to Story #%s，Do you want to edit it?';
+$lang->todo->noOptions    = 'You have no %s todo at the moment. Please reselect the Todo type.';
 
 $lang->todo->statusList['wait']   = 'Waiting';
 $lang->todo->statusList['doing']  = 'Doing';

module/todo/lang/fr.php

@@ -84,6 +84,7 @@ $lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 $lang->todo->confirmBug   = "Cette action est liée au Bug #%s. Voulez-vous l'éditer ?";
 $lang->todo->confirmTask  = "Cette action est liée à la Tâche #%s. Voulez-vous l'éditer ?";
 $lang->todo->confirmStory = "Cette action est liée à la Story #%s. Voulez-vous l'éditer ?";
+$lang->todo->noOptions    = 'Vous n\'avez pas de %s en attente pour le moment. Veuillez sélectionner le type de Todo.';
 
 $lang->todo->statusList['wait']   = 'En Attente';
 $lang->todo->statusList['doing']  = 'En cours';

module/todo/lang/zh-cn.php

@@ -85,6 +85,7 @@ $lang->todo->specifiedDay = array(1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 $lang->todo->confirmBug   = '该待办关联的是Bug #%s，需要修改它吗？';
 $lang->todo->confirmTask  = '该待办关联的是Task #%s，需要修改它吗？';
 $lang->todo->confirmStory = '该待办关联的是Story #%s，需要修改它吗？';
+$lang->todo->noOptions    = '您暂时没有待处理的%s，请重新选择待办类型。';
 
 $lang->todo->statusList['wait']   = '未开始';
 $lang->todo->statusList['doing']  = '进行中';

module/todo/view/batchcreate.html.php

@@ -14,6 +14,8 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('moduleList', $config->todo->moduleList)?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
+<?php js::set('noOptions', $lang->todo->noOptions);?>
+<?php js::set('chosenType', $lang->todo->typeList);?>
 <div id="mainContent">
   <div class="main-header">
     <h2><?php echo $lang->todo->batchCreate . $lang->todo->common;?></h2>

module/todo/view/batchedit.html.php

@@ -13,6 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('moduleList', $config->todo->moduleList)?>
+<?php js::set('noOptions', $lang->todo->noOptions);?>
+<?php js::set('chosenType', $lang->todo->typeList);?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <div id="mainContent" class="main-content">
   <div class="main-header">

module/todo/view/create.html.php

@@ -18,6 +18,8 @@
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <?php js::set('nameBoxLabel', array('custom' => $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?>
 <?php js::set('vision', $config->vision);?>
+<?php js::set('noOptions', $lang->todo->noOptions);?>
+<?php js::set('chosenType', $lang->todo->typeList);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

module/todo/view/edit.html.php

@@ -19,6 +19,8 @@
 <?php js::set('defaultType', $todo->type);?>
 <?php js::set('nameBoxLabel', array('custom' => $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?>
 <?php js::set('vision', $config->vision);?>
+<?php js::set('noOptions', $lang->todo->noOptions);?>
+<?php js::set('chosenType', $lang->todo->typeList);?>
 <?php if(common::checkNotCN()):?>
 <style> label.col-sm-1{width:100px;} </style>
 <?php endif;?>