* change QM to QD, RM to RD.

module/project/control.php

@@ -43,6 +43,7 @@ class project extends control
         if($locate == 'yes') $this->locate($this->createLink('project', 'task'));
 
         $this->commonAction($projectID);
+        $this->session->set('projectList', $this->app->getURI(true));
 
         $this->app->loadLang('my');
         $this->view->projectStats  = $this->project->getProjectStats($status);
@@ -1113,6 +1114,8 @@ class project extends control
         $users   = $this->user->getPairs('noclosed, nodeleted');
         $users   = array('' => '') + $users;
         $members = $this->project->getTeamMembers($projectID);
+        $teams   = $this->project->getTeams2Import($this->app->user->account, $projectID);
+        a($teams);
 
         /* The deleted members. */
         foreach($members as $account => $member)

module/project/lang/en.php

@@ -36,8 +36,8 @@ $lang->project->canceledBy    = 'Canceled by';
 $lang->project->canceledDate  = 'Canceled date';
 $lang->project->PO            = 'Product owner';
 $lang->project->PM            = 'Project manager';
-$lang->project->QM            = 'Test manager';
-$lang->project->RM            = 'Release manager';
+$lang->project->QD            = 'Quality director';
+$lang->project->RD            = 'Release director';
 $lang->project->acl           = 'Access limitation';
 $lang->project->teamname      = 'Team name';
 $lang->project->order         = 'Project order';

module/project/lang/zh-cn.php

@@ -36,8 +36,8 @@ $lang->project->canceledBy    = '由谁取消';
 $lang->project->canceledDate  = '取消日期';
 $lang->project->PO            = '产品负责人';
 $lang->project->PM            = '项目负责人';
-$lang->project->QM            = '测试负责人';
-$lang->project->RM            = '发布负责人';
+$lang->project->QD            = '测试负责人';
+$lang->project->RD            = '发布负责人';
 $lang->project->acl           = '访问控制';
 $lang->project->teamname      = '团队名称';
 $lang->project->order         = '项目排序';

module/project/model.php

@@ -311,14 +311,14 @@ class projectModel extends model
             ->exec();
         foreach($project as $fieldName => $value)
         {
-            if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QM' or $fieldName == 'RM' )
+            if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QD' or $fieldName == 'RD' )
             {
                 if(!empty($value) and !isset($team[$value]))
                 {
                     $member->project = (int)$projectID;
                     $member->account = $value;
                     $member->join    = helper::today();
-                    $member->role    = $fieldName;
+                    $member->role    = $this->lang->project->$fieldName;
                     $member->days    = $project->days;
                     $member->hours   = $this->config->project->defaultWorkhours;
                     $this->dao->insert(TABLE_TEAM)->data($member)->exec();
@@ -578,15 +578,15 @@ class projectModel extends model
      */
     public function getDefaultManagers($projectID)
     {
-        $managers = $this->dao->select('PO,QM,RM')->from(TABLE_PRODUCT)->alias('t1')
+        $managers = $this->dao->select('PO,QD,RD')->from(TABLE_PRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.product')
             ->where('t2.project')->eq($projectID)
             ->fetch();
         if($managers) return $managers;
 
         $managers->PO = '';
-        $managers->QM = '';
-        $managers->RM = '';
+        $managers->QD = '';
+        $managers->RD = '';
         return $managers;
     }
 
@@ -934,6 +934,18 @@ class projectModel extends model
         return array('' => '') + $users;
     }
 
+    public function getTeams2Import($account, $currentProject)
+    {
+        return $this->dao->select('t1.project, t2.name as projectName, t2.team as teamName')
+            ->from(TABLE_TEAM)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->where('t1.account')->eq($account)
+            ->andWhere('t1.project')->ne($currentProject)
+            ->groupBy('t1.project')
+            ->orderBy('t1.project DESC')
+            ->fetchAll('project');
+    }
+
     /**
      * Manage team members.
      * 

module/project/view/edit.html.php

@@ -53,12 +53,12 @@
       <td><?php echo html::select('PM', $users, $project->PM, 'class=text-3');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->project->QM;?></th>
-      <td><?php echo html::select('QM', $users, $project->QM, 'class=text-3');?></td>
+      <th class='rowhead'><?php echo $lang->project->QD;?></th>
+      <td><?php echo html::select('QD', $users, $project->QD, 'class=text-3');?></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->project->RM;?></th>
-      <td><?php echo html::select('RM', $users, $project->RM, 'class=text-3');?></td>
+      <th class='rowhead'><?php echo $lang->project->RD;?></th>
+      <td><?php echo html::select('RD', $users, $project->RD, 'class=text-3');?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>

module/project/view/view.html.php

@@ -81,12 +81,12 @@
             <td><?php echo $users[$project->PO];?></td>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->project->QM;?></th>
-            <td><?php echo $users[$project->QM];?></td>
+            <th class='rowhead'><?php echo $lang->project->QD;?></th>
+            <td><?php echo $users[$project->QD];?></td>
           </tr>
           <tr>
-            <th class='rowhead'><?php echo $lang->project->RM;?></th>
-            <td><?php echo $users[$project->RM];?></td>
+            <th class='rowhead'><?php echo $lang->project->RD;?></th>
+            <td><?php echo $users[$project->RD];?></td>
           </tr>
           <tr>
             <th class='rowhead'><?php echo $lang->project->products;?></th>