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

module/custom/lang/en.php

@@ -98,7 +98,7 @@ $lang->custom->notice->invalidStringKey  = 'The key should be lowercase letters,
 $lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
 $lang->custom->notice->noClosedBlock     = 'You have no blocks that are closed permanently.';
 $lang->custom->notice->required          = 'The selected field is required.';
-$lang->custom->notice->conceptResult     = 'According to your preference, <b> %s-%s </b> is set for you. Use <b>%s</b> + <b> %s</b>。';
+$lang->custom->notice->conceptResult     = 'According to your preference, <b> %s-%s </b> is set for you. Use <b>%s</b> + <b> %s</b>.';
 $lang->custom->notice->conceptPath       = 'Go to Admin -> Custom -> Concept to set it.';
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";

module/story/lang/en.php

@@ -76,7 +76,7 @@ $lang->story->assign         = 'Assign';
 $lang->story->verify         = 'Acceptance';
 $lang->story->pri            = 'Priority';
 $lang->story->estimate       = "Estimates {$lang->hourCommon}";
-$lang->story->estimateAB     = 'Est.' . $lang->hourCommon == 'hour' ? '(h)' : '(sp)';
+$lang->story->estimateAB     = 'Est.' . $lang->hourCommon == 'hour' ? '(h)' : '(SP)';
 $lang->story->hour           = $lang->hourCommon;
 $lang->story->status         = 'Status';
 $lang->story->subStatus      = 'Sub Status';

module/testtask/control.php

@@ -964,7 +964,7 @@ class testtask extends control
             ->andWhere('t2.status')->ne('wait')
             ->fetchGroup('case', 'id');
 
-        $this->view->caseIDList = $caseIDList;
+        $this->view->caseIDList = array_keys($cases);
         $this->view->productID  = $productID;
         $this->view->title      = $this->lang->testtask->batchRun;
         $this->view->position[] = $this->lang->testtask->common;

module/tree/model.php

@@ -39,24 +39,21 @@ class treeModel extends model
             ->beginIF($type == 'bug')->orWhere('type')->eq('bug')->fi()
             ->beginIF($type == 'case')->orWhere('type')->eq('case')->fi()
             ->andWhere('deleted')->eq('0')
+            ->orderBy('grade asc')
             ->fetchAll();
 
         $pairs    = array();
         $pairs[0] = '/';
         foreach($modules as $module)
         {
-            if($module->parent == '0') 
+            if($module->grade == 1) 
             {
                 $pairs[$module->id] = '/' . $module->name;
                 continue;
             }
 
-            $path           = substr($module->path, 1, -1);
-            $relatedModules = $this->dao->select('id, name')->from(TABLE_MODULE)->where('id')->in($path)->orderBy('grade')->fetchPairs();
-            $modulePath     = '';
-
-            foreach($relatedModules as $moduleName) $modulePath .= '/' . $moduleName; 
-            $pairs[$module->id] = $modulePath;
+            $moduleName = '/' . $module->name;
+            $pairs[$module->id] = isset($pairs[$module->parent]) ? $pairs[$module->parent] . $moduleName : $moduleName;
         }
 
         return $pairs;