Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x

module/task/view/batchedit.html.php

@@ -101,6 +101,11 @@
             }
             else
             {
+                if(!isset($taskMembers[$tasks[$taskID]->assignedTo]))
+                {
+                    $members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted');
+                    $members = array('' => '', 'ditto' => $this->lang->task->ditto) + $members;
+                }
                 $taskMembers = $members;
             }
             ?>

module/todo/model.php

@@ -33,7 +33,7 @@ class todoModel extends model
             ->setIF($this->post->type == 'feedback' and $this->post->feedback, 'idvalue', $this->post->feedback)
             ->setIF($this->post->date == false,  'date', '2030-01-01')
             ->setIF($this->post->begin == false, 'begin', '2400')
-            ->setIF($this->post->end   == false, 'end',   '2400')
+            ->setIF($this->post->begin == false or $this->post->end   == false, 'end',   '2400')
             ->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)
             ->remove('bug, task, story, uid, feedback')
             ->get();

module/user/view/story.html.php

@@ -51,7 +51,7 @@
       <tbody>
         <?php foreach($stories as $key => $story):?>
           <?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
-          <tr class='text-center'>
+          <tr class='text-left'>
           <td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td><?php echo $story->productTitle;?></td>

module/user/view/task.html.php

@@ -53,7 +53,7 @@
       </thead>   
       <tbody>
         <?php foreach($tasks as $task):?>
-        <tr class='text-center'>
+        <tr class='text-left'>
           <td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
           <td class='text-left nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>

module/user/view/testcase.html.php

@@ -49,7 +49,7 @@
       <tbody>
         <?php foreach($cases as $case):?>
         <?php $caseID = $type == 'case2Him' ? $case->case : $case->id?>
-        <tr class='text-center'>
+        <tr class='text-left'>
           <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
           <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>

module/user/view/todo.html.php

@@ -47,7 +47,7 @@
       </thead>
       <tbody>
       <?php foreach($todos as $todo):?>
-      <tr class='text-center'>
+      <tr class='text-left'>
         <td><?php echo $todo->id;?></td>
         <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
         <td><?php echo $lang->todo->typeList[$todo->type];?></td>