diff --git a/module/todo/js/common.js b/module/todo/js/common.js index e6f4a994ce..8668ff14f4 100644 --- a/module/todo/js/common.js +++ b/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 { diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php index 0b9ac21f6b..1ea4dad944 100644 --- a/module/todo/lang/de.php +++ b/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'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 3081828d39..1b2c1d615b 100644 --- a/module/todo/lang/en.php +++ b/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'; diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php index 98ad886135..2f3a4a9e13 100644 --- a/module/todo/lang/fr.php +++ b/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'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index cdd35d4f28..dbc2242cdb 100644 --- a/module/todo/lang/zh-cn.php +++ b/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'] = '进行中'; diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index 80399c61f9..771b7b6ce0 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -14,6 +14,8 @@ todo->moduleList)?> todo->getUserObjectsMethod)?> +todo->noOptions);?> +todo->typeList);?>