* Fix bug for port showimport.

module/bug/model.php

@@ -3577,7 +3577,6 @@ class bugModel extends model
         if($table) $relatedObjects = $this->dao->select($pairs)->from($table)->where('id')->in($relatedObjectIdList)->fetchPairs();
 
         if(in_array($object, array('build','resolvedBuild'))) $relatedObjects= array('trunk' => $this->lang->trunk) + $relatedObjects;
-
-        return $relatedObjects;
+        return array('' => '', 0 => '') + $relatedObjects;
     }
 }

module/port/config.php

@@ -15,7 +15,7 @@ $config->port->initFunction   = 'title,control,required,';
 $config->port->dateFeilds     = 'estStarted,realStarted,deadline,openedDate,assignedDate,finishedDate,canceledDate,closedDate,lastEditedDate,';
 $config->port->datetimeFeilds = '';
 $config->port->listFields     = '';
-$config->port->sysLangFields  = ',pri,status,type,mode,severity,os,browser,resolution,confirmed,source,reviewResult,stage,change';
+$config->port->sysLangFields  = ',pri,status,type,mode,severity,os,browser,resolution,confirmed,source,reviewResult,stage,change,category';
 $config->port->sysDataFields  = 'execution,product,user';
 $config->port->userFields     = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy';
 

module/port/model.php

@@ -884,11 +884,16 @@ class portModel extends model
             $datas = array_slice($datas, ($pagerID - 1) * $maxImport, $maxImport, true);
         }
 
-        if(!$maxImport)  $this->maxImport   = $result->allCount;
+        if(!$maxImport) $this->maxImport = $result->allCount;
         $result->maxImport = $maxImport;
         $result->isEndPage = $pagerID >= $result->allPager;
         $result->datas     = $datas;
 
+        foreach($datas as $data)
+        {
+            if(isset($data->id)) $this->session->set('insert', false);
+        }
+
         if(empty($datas)) die(js::locate('back'));
         return $result;
     }
@@ -1219,7 +1224,6 @@ class portModel extends model
         $key   = key($list);
         $addID = 1;
         if($model == 'task') $members = $this->loadModel('user')->getTeamMemberPairs($this->session->taskPortParams['executionID'], 'execution');
-        $this->session->set('insert', true);
 
         $appendFields    = $this->session->appendFields;
         $showImportCount = $this->config->port->lazyLoading ? $this->config->port->showImportCount : $this->maxImport;
@@ -1239,7 +1243,6 @@ class portModel extends model
             if(!empty($object->id))
             {
                 $html .= $object->id . html::hidden("id[$row]", $object->id);
-                $this->session->set('insert', false);
             }
             else
             {

module/port/view/header.html.php

@@ -13,7 +13,6 @@ $model          = $datas->model;
 $datas          = $datas->datas;
 $appendFields   = $this->session->appendFields;
 $notEmptyRule   = $this->session->notEmptyRule;
-$insert         = $this->session->insert;
 ?>
 <style>
 form{overflow-x: scroll}

module/port/view/showimport.html.php

@@ -17,7 +17,7 @@
         <?php include $app->getModuleRoot() . 'port/view/tfoot.html.php';?>
       </tfoot>
     </table>
-    <?php if(!$insert) include $app->getModuleRoot() . 'common/view/noticeimport.html.php';?>
+    <?php if(!$this->session->insert); include $app->getModuleRoot() . 'common/view/noticeimport.html.php';?>
   </form>
 </div>
 <?php include $app->getModuleRoot() . 'port/view/footer.html.php';?>

module/port/view/tfoot.html.php

@@ -3,7 +3,7 @@
     <?php
     $submitText  = $isEndPage ? $this->lang->save : $this->lang->file->saveAndNext;
     $isStartPage = $pagerID == 1 ? true : false;
-    if(!$insert and $dataInsert === '')
+    if(!$this->session->insert)
     {
         echo "<button type='button' data-toggle='modal' data-target='#importNoticeModal' class='btn btn-primary btn-wide'>{$submitText}</button>";
     }

module/story/config.php

@@ -171,6 +171,10 @@ $config->story->datatable->fieldList['reviewedBy']['required']   = 'no';
 $config->story->datatable->fieldList['reviewedBy']['control']    = 'multiple';
 $config->story->datatable->fieldList['reviewedBy']['dataSource'] = array('module' => 'story', 'method' => 'getStoriesReviewer', 'params' => '$productID');
 
+$config->story->datatable->fieldList['reviewer']['title']      = 'reviewedBy';
+$config->story->datatable->fieldList['reviewer']['control']    = 'multiple';
+$config->story->datatable->fieldList['reviewer']['dataSource'] = array('module' => 'story', 'method' => 'getStoriesReviewer', 'params' => '$productID');
+
 $config->story->datatable->fieldList['reviewedDate']['title']    = 'reviewedDate';
 $config->story->datatable->fieldList['reviewedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['reviewedDate']['width']    = '90';