* Adjust the header and the submit for close action.
This commit is contained in:
@@ -944,8 +944,7 @@ class testtask extends control
|
||||
$message = $this->executeHooks($taskID);
|
||||
if($message) $this->lang->saveSuccess = $message;
|
||||
|
||||
if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent.parent'));
|
||||
return $this->send(array('result' => 'success', 'message' => $this->lang->success, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
|
||||
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true));
|
||||
}
|
||||
|
||||
/* Get task info. */
|
||||
|
||||
@@ -852,7 +852,7 @@ class testtaskModel extends model
|
||||
$oldTesttask = $this->getById($taskID);
|
||||
$testtask = fixer::input('post')
|
||||
->add('id', $taskID)
|
||||
->setDefault('status', 'done')
|
||||
->add('status', 'done')
|
||||
->stripTags($this->config->testtask->editor->close['id'], $this->config->allowedTags)
|
||||
->join('mailto', ',')
|
||||
->remove('comment,uid')
|
||||
|
||||
@@ -10,17 +10,20 @@ declare(strict_types=1);
|
||||
*/
|
||||
namespace zin;
|
||||
|
||||
set::title($testtask->name);
|
||||
to::header
|
||||
(
|
||||
$lang->testtask->closeAction,
|
||||
entityLabel
|
||||
(
|
||||
set::entityID($testtask->id),
|
||||
set::level(1),
|
||||
set::text($testtask->name),
|
||||
set::reverse(true)
|
||||
)
|
||||
);
|
||||
|
||||
form
|
||||
(
|
||||
formGroup
|
||||
(
|
||||
set::label($lang->testtask->status),
|
||||
set::name('status'),
|
||||
set::value('done'),
|
||||
set::class('hidden'),
|
||||
),
|
||||
formGroup
|
||||
(
|
||||
set::label($lang->testtask->realFinishedDate),
|
||||
@@ -48,11 +51,12 @@ form
|
||||
set::value($testtask->mailto ? tr_replace(' ', '', $testtask->mailto) : ''),
|
||||
set::multiple(true),
|
||||
),
|
||||
select
|
||||
$contactList ? select
|
||||
(
|
||||
set::name('contact'),
|
||||
set::items($contactList),
|
||||
)
|
||||
on::change("setMailto('mailto', this.value)"),
|
||||
) : null
|
||||
)
|
||||
),
|
||||
set::actions(array('submit'))
|
||||
|
||||
Reference in New Issue
Block a user