Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#56625,done,1h] change name to id of tips.

Browse Source
This commit is contained in:
liumengyi
2024-11-04 08:26:08 +08:00
committed by 刘刚
parent 4f2c12d31f
commit 2ed9846543
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/all.ui.js
+5 -1
View File
@@ -10,7 +10,11 @@ $(document).off('click','.batch-btn').on('click', '.batch-btn', function()
const getNonClosableLink = $.createLink('execution', 'ajaxGetNonClosableExecutions', 'executionID=' + checkedList.join(','));
$.getJSON(getNonClosableLink, function(exeuctions)
{
if(!exeuctions) return;
if(!exeuctions || exeuctions.length == 0)
{
postBatchBtn($target, checkedList);
return;
}
const confirmCloseTip = confirmBatchCloseExecution.replace('%s', exeuctions.join(', '));
zui.Modal.confirm(confirmCloseTip).then((res) =>
module/execution/ui/close.html.php
+1 -1
View File
@@ -10,7 +10,7 @@ declare(strict_types=1);
*/
namespace zin;
$confirmTip = !empty($unclosedTasks) ? sprintf($this->lang->execution->confirmCloseExecution, implode($this->lang->comma, $unclosedTasks)) : '';
$confirmTip = !empty($unclosedTasks) ? sprintf($this->lang->execution->confirmCloseExecution, implode($this->lang->comma, array_keys($unclosedTasks))) : '';
$confirmURL = $this->createLink('execution', 'close', "executionID={$executionID}&from={$from}");
$beforeSubmit = jsRaw("() =>
{
module/execution/ui/edit.html.php
+1 -1
View File
@@ -17,7 +17,7 @@ jsVar('executionAttr', $execution->attribute);
jsVar('window.lastProjectID', $execution->project);
jsVar('weekend', $config->execution->weekend);
$confirmTip = !empty($unclosedTasks) ? sprintf($this->lang->execution->confirmCloseExecution, implode($this->lang->comma, $unclosedTasks)) : '';
$confirmTip = !empty($unclosedTasks) ? sprintf($this->lang->execution->confirmCloseExecution, implode($this->lang->comma, array_keys($unclosedTasks))) : '';
$beforeSubmit = jsRaw("() =>
{
if($('[name=status]').val() != 'closed') return true;