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

*Fixbug_sunjun#21630

Browse Source
This commit is contained in:
sunjun
2022-04-14 13:08:59 +08:00
parent d2fd124cb9
commit 38aa249dac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+2 -2
View File
@@ -252,7 +252,7 @@ class todoModel extends model
->remove(implode(',', $this->config->todo->moduleList) . ',uid')
->get();
if($todo->type != 'custom' and $todo->type != 'cycle')
if(in_array($todo->type, $this->config->todo->moduleList))
{
$type = $todo->type;
$object = $this->loadModel($type)->getByID($objectType);
@@ -330,7 +330,7 @@ class todoModel extends model
$todo->type = $data->types[$todoID];
$todo->pri = $data->pris[$todoID];
$todo->status = $data->status[$todoID];
$todo->name = ($todo->type == 'custom' or $todo->type == 'cycle' or $todo->type == 'feedback') ? $data->names[$todoID] : '';
$todo->name = !in_array($todo->type, $this->config->todo->moduleList) ? $data->names[$todoID] : '';
$todo->begin = isset($data->begins[$todoID]) ? $data->begins[$todoID] : 2400;
$todo->end = isset($data->ends[$todoID]) ? $data->ends[$todoID] : 2400;
module/todo/view/batchedit.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
<div id='<?php echo "nameBox" . $todo->id;?>' class='hidden'><?php echo html::input("names[$todo->id]", $todo->name, "class='text-left form-control hiddenwin'"); ?></div>
<div class='<?php echo "nameBox" . $todo->id;?> text-left'>
<?php
if($todo->type == 'custom' or $todo->type == 'cycle')
if(!in_array($todo->type, $this->config->todo->moduleList))
{
echo html::input("names[$todo->id]", $todo->name, "class='form-control'");
}