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

module/bug/model.php

@@ -155,6 +155,9 @@ class bugModel extends model
         if($result['stop']) return array('status' => 'exists', 'id' => $result['duplicate']);
 
         $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->create['id'], $this->post->uid);
+
+        /* Fix bug3102. */
+        if(strpos($this->config->bug->create->requiredFields, 'project') !== false && $bug->project == 0) $bug->project = '';
         $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
         if(!dao::isError())
         {

module/project/model.php

@@ -421,7 +421,7 @@ class projectModel extends model
             }
         }
 
-        /* Update views for team members. */
+        /* Fix bug#3074, Update views for team members. */
         $this->loadModel('user')->updateUserView($projectID, 'project', $changedAccounts);
         $products = $this->getProducts($projectID, false);
         foreach($products as $productID => $productName)

module/task/model.php

@@ -23,7 +23,7 @@ class taskModel extends model
     public function create($projectID)
     {
         if($this->post->estimate < 0)
-        {    
+        {
             dao::$errors[] = $this->lang->task->error->recordMinus;
             return false;
         }
@@ -79,7 +79,12 @@ class taskModel extends model
             /* Fix Bug #1525 */
             $projectType    = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('type');
             $requiredFields = "," . $this->config->task->create->requiredFields . ",";
-            if($projectType == 'ops') $requiredFields = str_replace(",story,", ',', "$requiredFields");
+            if($projectType == 'ops')
+            {
+                $requiredFields = str_replace(",story,", ',', "$requiredFields");
+                $task->story = 0;
+            }
+
             if($this->post->selectTestStory)
             {
                 $requiredFields = str_replace(",estimate,", ',', "$requiredFields");
@@ -1211,6 +1216,8 @@ class taskModel extends model
     public function recordEstimate($taskID)
     {
         $record = fixer::input('post')->get();
+
+        /* Fix bug#3036. */
         foreach($record->consumed as $id => $item)
         {
             if(!trim($item))