Merge branch 'master' of github.com:easysoft/zentaopms

2020-07-01 17:51:06 +08:00
parent 97429381e8 31a2245b00
commit a2cd825d1f
23 changed files with 43 additions and 24 deletions
@@ -54,13 +54,12 @@ class taskModel extends model
            ->setIF(is_numeric($this->post->left),     'left',     (float)$this->post->left)
            ->setDefault('openedBy',   $this->app->user->account)
            ->setDefault('openedDate', helper::now())
-            ->cleanINT('project,story')
+            ->cleanINT('project,story,module')
            ->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
            ->join('mailto', ',')
            ->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate')
            ->get();
        if($task->type != 'test') $this->post->set('selectTestStory', 0);
-        if($task->project == 0) $task->project = '';

        foreach($this->post->assignedTo as $assignedTo)
        {
@@ -760,6 +759,7 @@ class taskModel extends model
            ->setDefault('lastEditedBy',   $this->app->user->account)
            ->add('lastEditedDate', $now)
            ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
+            ->cleanINT('project,story,module')
            ->join('mailto', ',')
            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
            ->get();