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

module/block/view/taskblock.html.php

@@ -31,7 +31,7 @@ td.delayed{background: #e84e0f!important; color: white;}
   ?>
   <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
     <td class='text-center'><?php echo $task->id;?></td>
-    <td class='text-center'><?php echo zget(array_keys($lang->task->priList), $task->pri, $task->pri)?></td>
+    <td class='text-center'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></td>
     <td style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
     <td class='text-center'><?php echo $task->estimate?></td>
     <td class='<?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>

module/misc/lang/en.php

@@ -74,6 +74,20 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Details';
 
+$lang->misc->feature->all['9.7.stable'][] = array('title'=>'optimize International package，Added Demo data。', 'desc' => '');
+
+$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Webhook Interface feature', 'desc' => 'support communication with BearyChat,dingding');
+$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Score feature', 'desc' => 'More skilled Use, More score');
+$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Multiplayer task and subTask to project tasks', 'desc' => '');
+$lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Product line management to Product View', 'desc' => '');
+
+$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operatio', 'desc' => '');
+
+$lang->misc->feature->all['9.3.beta'][] = array('title'=>'upgraded framework，Enhanced security', 'desc' => '');
+
+$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>added TestSuite,CaseLib and Test Statements</p>');
+$lang->misc->feature->all['9.1.stable'][] = array('title'=>'support Group steps of TestCase', 'desc' => '');
+
 $lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => '<p>ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.</p>');
 $lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => '');
 

module/my/view/task.html.php

@@ -54,7 +54,11 @@
       </td>
       <td><span class='<?php echo 'pri' . $task->pri;?>'><?php echo $task->pri;?></span></td>
       <td class='nobr text-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
-      <td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?></td>
+      <td class='text-left nobr'>
+        <?php if(!empty($task->team))   echo '<span class="label">' . $this->lang->task->multipleAB . '</span> ';?>
+        <?php if(!empty($task->parent)) echo '<span class="label">' . $this->lang->task->childrenAB . '</span> ';?>
+        <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?>
+      </td>
       <td><?php echo zget($users, $task->openedBy);?></td>
       <td><?php echo zget($users, $task->assignedTo);?></td>
       <td><?php echo zget($users, $task->finishedBy);?></td>

module/project/view/grouptask.html.php

@@ -55,7 +55,7 @@
     $groupWait     = 0;
     $groupDone     = 0;
     $groupDoing    = 0;
-    $groupClosed   = 0;  
+    $groupClosed   = 0;
     $groupEstimate = 0.0;
     $groupConsumed = 0.0;
     $groupLeft     = 0.0;
@@ -113,7 +113,7 @@
       </td>
       <?php endif;?>
       <td><?php echo $task->id;?></td>
-      <td><span class='<?php echo 'pri' . zget(array_keys($lang->task->priList), $task->pri, $task->pri)?>'><?php echo zget(array_keys($lang->task->priList), $task->pri, $task->pri);?></span></td>
+      <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
       <td class='text-left'>
           <?php
             if(!empty($task->team))   echo '<span class="label">' . $lang->task->multipleAB . '</span> ';

module/search/view/buildform.html.php

@@ -376,7 +376,7 @@ foreach($fieldParams as $fieldName => $param)
           echo '</td>';
 
           /* Print field. */
-          echo "<td class='w-90px'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control'") . '</td>';
+          echo "<td class='w-110px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
 
           /* Print operator. */
           echo "<td class='w-70px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
@@ -435,7 +435,7 @@ foreach($fieldParams as $fieldName => $param)
           echo '</td>';
 
           /* Print field. */
-          echo "<td class='w-90px'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control'") . '</td>';
+          echo "<td class='w-90px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
 
           /* Print operator. */
           echo "<td class='w-70px'>" .  html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';

module/task/model.php

@@ -672,6 +672,7 @@ class taskModel extends model
             $task->status       = 'done';
             $task->finishedBy   = $oldTask->openedBy; // Fix bug#1341
             $task->finishedDate = helper::now();
+            $task->assignedTo   = $oldTask->openedBy; // Fix bug#1341
         }
         else
         {
@@ -741,7 +742,7 @@ class taskModel extends model
      *
      * @param  int    $taskID
      * @access public
-     * @return void
+     * @return array
      */
     public function recordEstimate($taskID)
     {
@@ -2264,8 +2265,8 @@ class taskModel extends model
 
     /**
      * Get mail subject.
-     * 
-     * @param  object    $task 
+     *
+     * @param  object    $task
      * @access public
      * @return string
      */
@@ -2277,8 +2278,8 @@ class taskModel extends model
 
     /**
      * Get toList and ccList.
-     * 
-     * @param  object    $task 
+     *
+     * @param  object    $task
      * @access public
      * @return bool|array
      */