Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8

db/update9.8.2.sql

@@ -1,2 +1,2 @@
-ALTER TABLE `zt_team` DROP PRIMARY KEY,
-ADD PRIMARY KEY (`root`,`type`,`account`);
+ALTER TABLE `zt_team` DROP PRIMARY KEY;
+ALTER TABLE `zt_team` ADD PRIMARY KEY (`root`, `type`, `account`);

module/common/model.php

@@ -922,7 +922,6 @@ class commonModel extends model
         $queryCondition = $this->session->$queryCondition;
         $orderBy = $type . 'OrderBy';
         $orderBy = $this->session->$orderBy;
-        $orderBy = str_replace('`left`', 'left', $orderBy); // process the `left` to left.
 
         if(empty($queryCondition) or $this->session->$typeOnlyCondition)
         {

module/common/view/header.lite.html.php

@@ -16,7 +16,6 @@ $clientTheme  = $this->app->getClientTheme();
   <meta name="renderer" content="webkit">
   <?php
   echo html::title($title . ' - ' . $lang->zentaoPMS);
-
   js::exportConfigVars();
   if($config->debug)
   {

module/extension/view/obtain.html.php

@@ -105,7 +105,7 @@
                       }
                       else
                       {
-                          echo html::commonButton("<i class='icon-ok'></i> " . $lang->extension->installed, "disabled='disabled'", 'text-success');
+                          echo html::commonButton("<i class='icon-ok'></i> " . $lang->extension->installed, "disabled='disabled' style='height:34px;'", 'text-success');
                       }
                   }
                   else

module/my/view/todo.html.php

@@ -52,7 +52,7 @@
         <th class='w-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
         <th class='w-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
         <th class='w-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
-        <th class='w-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+        <th class='w-pri' style="width:80px;"><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
         <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
         <th class='w-hour'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
         <th class='w-hour'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>

module/story/control.php

@@ -1462,7 +1462,7 @@ class story extends control
                     foreach(explode(',', $story->plan) as $planID)
                     {
                         if(empty($planID)) continue;
-                        if(isset($relatedPlans[$planID]))$plans .= $relatedPlans[$planID] . "(#$planID) ";
+                        if(isset($relatedPlans[$planID]))$plans .= $relatedPlans[$planID] . "(#$planID)";
                     }
                     $story->plan = $plans;
                 }

module/testsuite/model.php

@@ -688,8 +688,8 @@ class testsuiteModel extends model
                             if($stepData->type == 'step')  $parentStepID = 0;
                         }
                     }
-                    $oldCase->steps  = $this->joinStep($oldStep);
-                    $caseData->steps = $this->joinStep($steps);
+                    $oldCase->steps  = $this->testcase->joinStep($oldStep);
+                    $caseData->steps = $this->testcase->joinStep($steps);
                     $changes  = common::createChanges($oldCase, $caseData);
                     $actionID = $this->action->create('case', $caseID, 'Edited');
                     $this->action->logHistory($actionID, $changes);

module/user/model.php

@@ -210,7 +210,7 @@ class userModel extends model
         if(strtolower($_POST['account']) == 'guest') return false;
 
         $user = fixer::input('post')
-            ->setDefault('join', '0000-00-00')
+            ->setDefault('join', $this->post->join)
             ->setIF($this->post->password1 != false, 'password', md5($this->post->password1))
             ->setIF($this->post->password1 == false, 'password', '')
             ->setIF($this->post->email != false, 'email', trim($this->post->email))

module/user/view/create.html.php

@@ -51,6 +51,10 @@
         <th><?php echo $lang->user->password2;?></th>
         <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->user->join;?></th>
+        <td><?php echo html::input('join', date('Y-m-d'), "class='form-control form-date'");?></td>
+      </tr>
       <tr>
         <th><?php echo $lang->user->role;?></th>
         <td><?php echo html::select('role', $lang->user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?></td>

module/user/view/edit.html.php

@@ -34,6 +34,10 @@
         <th><?php echo $lang->user->role;?></th>
         <td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='form-control'");?></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->user->join;?></th>
+        <td><?php echo html::input('join', $user->join, "class='form-control form-date'");?></td>
+      </tr>
       <tr>
         <th><?php echo $lang->group->priv;?></th>
         <td colspan='3'><?php echo html::select('groups[]', $groups, $userGroups, 'size=3 multiple=multiple class="form-control chosen"');?></td>