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

module/bug/control.php

@@ -982,7 +982,7 @@ class bug extends control
             }
             $this->loadModel('score')->create('ajax', 'batchOther');
         }
-        if($type == 'product') die(js::locate($this->createLink('bug', 'browse', "productID=$projectID"), 'parent'));
+        if($type == 'product') die(js::locate($this->session->bugList, 'parent'));
         if($type == 'my')      die(js::locate($this->createLink('my', 'bug')));
         die(js::locate($this->createLink('project', 'bug', "projectID=$projectID")));
     }

module/bug/view/create.html.php

@@ -195,6 +195,7 @@ js::set('flow', $config->global->flow);
                 }
                 $priList = $lang->bug->priList;
                 if(end($priList)) unset($priList[0]);
+                if(!isset($priList[$pri])) $pri = reset($priList);
                 ?>
                 <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>

module/caselib/view/createcase.html.php

@@ -91,6 +91,7 @@
               }
               $priList = $lang->testcase->priList;
               if(end($priList)) unset($priList[0]);
+              if(!isset($priList[$pri])) $pri = reset($priList);
               ?>
               <?php if($hasCustomPri):?>
               <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>

module/custom/control.php

@@ -287,6 +287,7 @@ class custom extends control
 
         /* Get this module requiredFields. */
         $this->loadModel($moduleName);
+        if($moduleName == 'user') $this->app->loadModuleConfig($moduleName);
         $requiredFields = $this->custom->getRequiredFields($this->config->$moduleName);
 
         if($moduleName == 'doc')

module/product/model.php

@@ -994,7 +994,7 @@ class productModel extends model
         $allCount  = 0;
         foreach($stories as $key => $story)
         {
-            if($story->type != $storyType) continue;
+            if(!empty($story->type) && $story->type != $storyType) continue;
 
             $totalEstimate += $story->estimate;
             /* When the status is not closed or closedReason is done or postponed then add cases rate..*/

module/productplan/view/view.html.php

@@ -341,7 +341,7 @@
               </div>
             </div>
             <?php endif;?>
-            <div class='text'><?php echo $summary;?></div>
+            <div class='table-statistic'><?php echo $summary;?></div>
             <?php
             $this->app->rawParams['type'] = 'story';
             $storyPager->show('right', 'pagerjs');
@@ -420,7 +420,7 @@
               <?php echo html::submitButton($lang->productplan->batchUnlink, '', 'btn');?>
             </div>
             <?php endif;?>
-            <div class='text'><?php echo sprintf($lang->productplan->bugSummary, count($planBugs));?></div>
+            <div class='table-statistic'><?php echo sprintf($lang->productplan->bugSummary, count($planBugs));?></div>
             <?php
             $this->app->rawParams['type'] = 'bug';
             $bugPager->show('right', 'pagerjs');

module/story/view/create.html.php

@@ -133,6 +133,7 @@
 
                     $priList = $lang->story->priList;
                     if(end($priList)) unset($priList[0]);
+                    if(!isset($priList[$pri])) $pri = reset($priList);
                     ?>
                     <?php if($hasCustomPri):?>
                     <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>

module/task/control.php

@@ -43,7 +43,7 @@ class task extends control
      * @access public
      * @return void
      */
-    public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0)
+    public function create($projectID = 0, $storyID = '', $moduleID = 0, $taskID = 0, $todoID = 0)
     {
         $this->project->getLimitedProject();
         $limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : '';

module/task/view/create.html.php

@@ -163,6 +163,7 @@
               }
               $priList = $lang->task->priList;
               if(end($priList)) unset($priList[0]);
+              if(!isset($priList[$task->pri])) $task->pri = reset($priList);
               ?>
               <?php if($hasCustomPri):?>
               <?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control'");?>

module/testcase/view/create.html.php

@@ -108,6 +108,7 @@
               }
               $priList = $lang->testcase->priList;
               if(end($priList)) unset($priList[0]);
+              if(!isset($priList[$pri])) $pri = reset($priList);
               ?>
               <?php if($hasCustomPri):?>
               <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>

www/js/my.full.js

@@ -329,9 +329,19 @@ function ajaxDelete(url, replaceID, notice)
             {
                 if(data.result == 'success')
                 {
+                    var $table = $('#' + replaceID).closest('[data-ride="table"]');
+                    if($table.length)
+                    {
+                        var table = $table.data('zui.table');
+                        if(table)
+                        {
+                            table.options.replaceId = replaceID;
+                            return table.reload();
+                        }
+                    }
                     $.get(document.location.href, function(data)
                     {
-                        if(!($(data).find('#' + replaceID).length))location.reload();
+                        if(!($(data).find('#' + replaceID).length)) location.reload();
                         $('#' + replaceID).html($(data).find('#' + replaceID).html());
                         if(typeof sortTable == 'function') sortTable();
                         $('#' + replaceID).find('[data-toggle=modal], a.iframe').modalTrigger();
@@ -715,11 +725,11 @@ function bootAlert(message)
 
 /**
  * Toggle fold or unfold for parent.
- * 
- * @param  string $form 
- * @param  array  $unfoldIdList 
- * @param  int    $objectID 
- * @param  string $objectType 
+ *
+ * @param  string $form
+ * @param  array  $unfoldIdList
+ * @param  int    $objectID
+ * @param  string $objectType
  * @access public
  * @return void
  */