Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite

db/update16.1.sql

@@ -1,3 +1,4 @@
 ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `order`;
 ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `order`;
 ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `order`;
+ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `v2`;

db/zentao.sql

@@ -1370,6 +1370,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   `lines` varchar(10) NOT NULL,
   `v1` varchar(40) NOT NULL,
   `v2` varchar(40) NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'common',
   `deleted` enum('0','1') NOT NULL default '0',
    PRIMARY KEY (`id`),
   KEY `execution` (`execution`),

extension/lite/block/ext/view/main.lite.html.hook.php

@@ -0,0 +1,4 @@
+<script>
+$('.block-project table > thead > tr > th:last-child').remove();
+$('.block-project table > tbody > tr > td:last-child').remove();
+</script>

extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php

@@ -0,0 +1,3 @@
+<script>
+$('#assigntomeBlock>ul>li>a:not([href$="todo"]):not([href$="task"])').parent().remove();
+</script>

extension/lite/common/ext/lang/zh-cn/lite.php

@@ -11,7 +11,7 @@ $lang->mainNav->menuOrder[65] = 'admin';
 $lang->my->menu           = new stdclass();
 $lang->my->menu->index    = array('link' => "$lang->dashboard|my|index");
 $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo');
-$lang->my->menu->task     = array('link' => "{$lang->task->common}|my|task|", 'subModule' => 'task');
+$lang->my->menu->task     = array('link' => "{$lang->task->common}|my|contribute|mode=task&type=assignedTo", 'subModule' => 'task');
 
 /* My menu order. */
 $lang->my->menuOrder     = array();

extension/lite/my/ext/view/task.html.php

@@ -0,0 +1,319 @@
+<?php
+/**
+ * The task view file of dashboard module for lite vision of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Wenrui LI <liwenrui@easycorp.ltd>
+ * @package     dashboard
+ * @version     $Id: task.html.php 5101 2013-07-12 00:44:27Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $this->app->getModuleRoot() . '/common/view/header.html.php';?>
+<?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>"; ?>
+    <?php if($app->rawMethod == 'contribute'):?>
+    <?php
+    echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedTo"),  "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"),    "<span class='text'>{$lang->my->taskMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink($app->rawMethod, "mode=$mode&type=finishedBy"),  "<span class='text'>{$lang->my->taskMenu->finishedByMe}</span>" . ($type == 'finishedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'finishedBy' ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),    "<span class='text'>{$lang->my->taskMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
+    echo html::a(inlink($app->rawMethod, "mode=$mode&type=canceledBy"),  "<span class='text'>{$lang->my->taskMenu->canceledByMe}</span>" . ($type == 'canceledBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'canceledBy' ? ' btn-active-text' : '') . "'");
+    ?>
+    <?php endif;?>
+  </div>
+</div>
+<div id="mainContent">
+  <?php if(empty($tasks)):?>
+  <div class="table-empty-tip">
+    <p><span class="text-muted"><?php echo $lang->task->noTask;?></span></p>
+  </div>
+  <?php else:?>
+  <form id='myTaskForm' class="main-table table-task skip-iframe-modal" method="post">
+    <?php $canBatchEdit  = (common::hasPriv('task', 'batchEdit')  and $type == 'assignedTo');?>
+    <?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
+    <table class="table has-sort-head table-fixed" id='taskTable'>
+      <?php $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+      <thead>
+        <tr>
+          <th class="c-id">
+            <?php if($canBatchEdit or $canBatchClose):?>
+            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+              <label></label>
+            </div>
+            <?php endif;?>
+            <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+          </th>
+          <th class='c-pri'><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-name'><?php common::printOrderLink('name',       $orderBy, $vars, $lang->task->name);?></th>
+          <?php if($config->systemMode == 'new'):?>
+          <th class='c-project'><?php common::printOrderLink('project',    $orderBy, $vars, $lang->my->projects);?></th>
+          <?php endif;?>
+          <th class='c-project'><?php common::printOrderLink('execution',  $orderBy, $vars, $lang->my->executions);?></th>
+          <?php if($type != 'openedBy'): ?>
+          <th class='c-user'><?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+          <?php endif;?>
+          <th class='c-date text-center'><?php common::printOrderLink('deadline',   $orderBy, $vars, $lang->task->deadlineAB);?></th>
+          <?php if($type != 'assignedTo'): ?>
+          <th class='c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedTo);?></th>
+          <?php endif;?>
+          <?php if($type != 'finishedBy'): ?>
+          <th class='c-user'><?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedBy);?></th>
+          <?php endif;?>
+          <th class='c-hours'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->task->estimateAB);?></th>
+          <th class='c-hours'><?php common::printOrderLink('consumed',   $orderBy, $vars, $lang->task->consumedAB);?></th>
+          <th class='c-hours'><?php common::printOrderLink('left',       $orderBy, $vars, $lang->task->leftAB);?></th>
+          <th class='c-status'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='c-actions-6'><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody id='myTaskList'>
+        <?php foreach($tasks as $task):?>
+        <?php $canBeChanged = common::canBeChanged('task', $task);?>
+        <tr data-id='<?php echo $task->id;?>' data-status='<?php echo $task->status?>' data-estimate='<?php echo $task->estimate?>' data-consumed='<?php echo $task->consumed?>' data-left='<?php echo $task->left?>'>
+          <td class="c-id">
+            <?php if($canBatchEdit or $canBatchClose):?>
+            <div class="checkbox-primary">
+              <input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>' <?php if(!$canBeChanged) echo 'disabled';?>/>
+              <label></label>
+            </div>
+            <?php endif;?>
+            <?php printf('%03d', $task->id);?>
+          </td>
+          <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
+          <td class='c-name <?php if(!empty($task->children)) echo 'has-child';?>' title='<?php echo $task->name?>'>
+            <?php if(!empty($task->team))   echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
+            <?php
+            if($task->parent > 0)
+            {
+                echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ' . html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->parentName . ' / '. $task->name, '', "title='{$task->parentName} / {$task->name}'");
+            }
+            else
+            {
+                echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color'");
+            }
+            ?>
+            <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
+          </td>
+          <?php if($config->systemMode == 'new'):?>
+          <td class='c-project' title="<?php echo $task->projectName;?>"><?php echo html::a($this->createLink('project', 'index', "projectID=$task->project"), $task->projectName);?></td>
+          <?php endif;?>
+          <td class='c-project' title="<?php echo $task->executionName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '');?></td>
+          <?php if($type != 'openedBy'): ?>
+          <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
+          <?php endif;?>
+          <td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
+          <?php if($type != 'assignedTo'): ?>
+          <td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($task, $users);?></td>
+          <?php endif;?>
+          <?php if($type != 'finishedBy'): ?>
+          <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
+          <?php endif;?>
+          <td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->estimate, 1) . $lang->execution->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->consumed, 1) . $lang->execution->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->left,     1) . $lang->execution->workHourUnit;?></td>
+          <td class='c-status'>
+            <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
+            <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
+          </td>
+          <td class='c-actions'>
+            <?php
+            if($canBeChanged)
+            {
+                if($task->needConfirm)
+                {
+                    $this->lang->task->confirmStoryChange = $this->lang->confirm;
+                    common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin', '', '', '', '', $task->project);
+                }
+                else
+                {
+                    if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project);
+                    if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project);
+                    common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project);
+                    common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project);
+
+                    common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->project);
+                    common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'", '', $task->project);
+                    common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=true", $task, 'list', 'split', '', 'iframe', true, "data-width='95%'", $this->lang->task->children, $task->project);
+                }
+            }
+            ?>
+          </td>
+        </tr>
+        <?php if(!empty($task->children)):?>
+          <?php $i = 0;?>
+          <?php foreach($task->children as $key => $child):?>
+          <?php $class  = $i == 0 ? ' table-child-top' : '';?>
+          <?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
+          <tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
+            <td class="c-id">
+              <?php if($canBatchEdit or $canBatchClose):?>
+              <div class="checkbox-primary">
+                <input type='checkbox' name='taskIDList[]' value='<?php echo $child->id;?>' <?php if(!$canBeChanged) echo 'disabled';?>/>
+                <label></label>
+              </div>
+              <?php endif;?>
+              <?php printf('%03d', $child->id);?>
+            </td>
+            <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $child->pri;?>' title='<?php echo zget($lang->task->priList, $child->pri);?>'><?php echo zget($lang->task->priList, $child->pri);?></span></td>
+            <td class='c-name' title='<?php echo $child->name?>'>
+              <?php if($child->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
+              <?php echo html::a($this->createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?>
+            </td>
+            <?php if($config->systemMode == 'new'):?>
+            <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('project', 'view', "projectID=$child->project"), $child->projectName);?></td>
+            <?php endif;?>
+            <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '');?></td>
+            <?php if($type != 'openedBy'): ?>
+            <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
+            <?php endif;?>
+            <td class="text-center <?php echo isset($child->delay) ? 'delayed' : '';?>"><?php if(substr($child->deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?></td>
+            <?php if($type != 'assignedTo'): ?>
+            <td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($child, $users);?></td>
+            <?php endif;?>
+            <?php if($type != 'finishedBy'): ?>
+            <td class='c-user'><?php echo zget($users, $child->finishedBy);?></td>
+            <?php endif;?>
+            <td class='c-hours' title="<?php echo round($child->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->estimate, 1) . ' ' . $lang->execution->workHourUnit;?></td>
+            <td class='c-hours' title="<?php echo round($child->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->consumed, 1) . ' ' . $lang->execution->workHourUnit;?></td>
+            <td class='c-hours' title="<?php echo round($child->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->left,     1) . ' ' . $lang->execution->workHourUnit;?></td>
+            <td class='c-status'>
+              <?php $storyChanged = (!empty($child->storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?>
+              <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$child->status}'> " . $this->processStatus('task', $child) . "</span>");?>
+            </td>
+            <td class='c-actions'>
+              <?php
+              if($canBeChanged)
+              {
+                  if($child->needConfirm)
+                  {
+                      $this->lang->task->confirmStoryChange = $this->lang->confirm;
+                      common::printIcon('task', 'confirmStoryChange', "taskid=$child->id", '', 'list', '', 'hiddenwin', '', '', '', '', $child->project);
+                  }
+                  else
+                  {
+                      if($child->status != 'pause') common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project);
+                      if($child->status == 'pause') common::printIcon('task', 'restart', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project);
+                      common::printIcon('task', 'close',  "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project);
+                      common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project);
+
+                      common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true, '', '', $child->project);
+                      common::printIcon('task', 'edit',   "taskID=$child->id", $child, 'list', '', '', '', '', '', '', $child->project);
+                      common::printIcon('task', 'batchCreate', "executionID=$child->execution&storyID=$child->story&moduleID=$child->module&taskID=$child->id&iframe=true", $child, 'list', 'split', '', 'iframe', true, '', $this->lang->task->children, $child->project);
+                  }
+              }
+              ?>
+            </td>
+          </tr>
+          <?php $i ++;?>
+          <?php endforeach;?>
+          <?php endif;?>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <div class="table-footer">
+      <?php if($canBatchClose or $canBatchEdit):?>
+      <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <?php endif;?>
+      <div class="table-actions btn-toolbar">
+      <?php
+      if($canBatchEdit)
+      {
+          $actionLink = $this->createLink('task', 'batchEdit');
+          $misc       = "data-form-action='$actionLink'";
+          echo html::commonButton($lang->edit, $misc);
+      }
+
+      if($canBatchClose)
+      {
+          $actionLink = $this->createLink('task', 'batchClose', null, '', '', $task->project);
+          echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
+      }
+      ?>
+      </div>
+      <div class="table-statistic"><?php echo $summary;?></div>
+      <?php $pager->show('right', 'pagerjs');?>
+    </div>
+  </form>
+  <?php endif;?>
+</div>
+<?php js::set('tasks', $tasks);?>
+<script>
+$(function()
+{
+    /* Update table summary text. */
+    var checkedSummary = '<?php echo $lang->execution->checkedSummary?>';
+    var pageSummary    = '<?php echo $lang->execution->pageSummary?>';
+
+    $('#myTaskForm').table(
+    {
+        hot: true,
+        replaceId: 'myTaskList',
+        statisticCreator: function(table)
+        {
+            var $table = table.getTable();
+            var $checkedRows = $table.find(table.isDataTable ? '.datatable-row-left.checked' : 'tbody>tr.checked');
+            var $originTable = table.isDataTable ? table.$.find('.datatable-origin') : null;
+            var checkedTotal = $checkedRows.length;
+            var $rows = checkedTotal ? $checkedRows : $table.find(table.isDataTable ? '.datatable-rows .datatable-row-left' : 'tbody>tr');
+
+            var checkedWait     = 0;
+            var checkedDoing    = 0;
+            var checkedEstimate = 0;
+            var checkedConsumed = 0;
+            var checkedLeft     = 0;
+            var taskIdList      = [];
+
+            $rows.each(function()
+            {
+                var $row = $(this);
+                if ($originTable)
+                {
+                    $row = $originTable.find('tbody>tr[data-id="' + $row.data('id') + '"]');
+                }
+                var data = $row.data();
+                taskIdList.push(data.id);
+
+                var status = data.status;
+                if(status === 'wait') checkedWait++;
+                if(status === 'doing') checkedDoing++;
+
+                var canStatistics = false;
+                if(!$row.hasClass('table-children'))
+                {
+                    canStatistics = true;
+                }
+                else
+                {
+                    var parentID = 0;
+                    var classes  = $row.attr('class').split(' ');
+                    for(i in classes)
+                    {
+                        if(classes[i].indexOf('parent-') >= 0) parentID = classes[i].replace('parent-', '');
+                    }
+
+                    if(parentID && taskIdList.indexOf(parseInt(parentID)) < 0) canStatistics = true;
+                }
+
+                if(canStatistics)
+                {
+                    checkedEstimate += Number(data.estimate);
+                    checkedConsumed += Number(data.consumed);
+                    if(status != 'cancel' && status != 'closed') checkedLeft += Number(data.left);
+                }
+            });
+            return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait)
+              .replace('%doing%', checkedDoing)
+              .replace('%estimate%', checkedEstimate.toFixed(1))
+              .replace('%consumed%', checkedConsumed.toFixed(1))
+              .replace('%left%', checkedLeft.toFixed(1));
+        }
+    })
+});
+</script>
+<?php include $this->app->getModuleRoot() . '/common/view/footer.html.php';?>

extension/lite/product/ext/view/browse.html.php

@@ -10,14 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php
-if(empty($productID))
-{
-    $productID   = key($projectProducts);
-    $product     = $projectProducts[$productID];
-    $productName = $product->name;
-}
-?>
 <?php include $this->app->getModuleRoot() . '/common/view/header.html.php';?>
 <?php include $this->app->getModuleRoot() . '/common/view/datatable.fix.html.php';?>
 <style>
@@ -357,9 +349,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
               $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink', '', '#productStoryForm')\"" : '';
               echo "<li $class>" . html::a('#', $lang->close, '', $misc) . "</li>";
 
-              $class = $canBatchUnlink ? '' : "class='disabled'";
-              echo "<li $class>" . html::a('#', $lang->story->unlink, '', "id='batchUnlinkStory'") . "</li>";
-
               if($canBatchReview)
               {
                   echo "<li class='dropdown-submenu'>";
@@ -401,22 +390,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
                   echo "<li $class>" . html::a('javascript:;', $lang->story->review,  '', $class) . '</li>';
               }
 
-              if($canBatchChangeBranch and $this->session->currentProductType and $this->session->currentProductType != 'normal' and $productID)
-              {
-                  $withSearch = count($branchTagOption) > 8;
-                  echo "<li class='dropdown-submenu'>";
-                  echo html::a('javascript:;', $lang->product->branchName[$this->session->currentProductType], '', "id='branchItem'");
-                  echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                  echo "<ul class='dropdown-list'>";
-                  foreach($branchTagOption as $id => $branchName)
-                  {
-                      $actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$id");
-                      echo "<li class='option' data-key='$id'>" . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#productStoryForm')\"") . "</li>";
-                  }
-                  echo '</ul>';
-                  if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
-                  echo '</div></li>';
-              }
 
               if($storyType == 'story')
               {
@@ -472,38 +445,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
             </div>
           </div>
           <?php endif;?>
-          <?php if($canBatchChangePlan and $storyType == 'story'):?>
-          <div class="btn-group dropup">
-            <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->planAB;?> <span class="caret"></span></button>
-            <?php
-            unset($plans['']);
-            $plans      = array(0 => $lang->null) + $plans;
-            $withSearch = count($plans) > 8;
-            ?>
-            <div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
-              <?php if($withSearch):?>
-              <div class="input-control search-box has-icon-left has-icon-right search-example">
-                <input id="planSearchBox" type="search" autocomplete="off" class="form-control search-input">
-                <label for="planSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
-                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
-              </div>
-              <?php $plansPinYin = common::convert2Pinyin($plans);?>
-              <?php endif;?>
-              <div class="list-group">
-                <?php
-                foreach($plans as $planID => $plan)
-                {
-                    $position   = stripos($plan, '/');
-                    $planLabel  = $position === false ? $plan : ('<span class="label label-outline label-badge">' . substr($plan, 0, $position) . '</span>' . substr($plan, $position + 1));
-                    $searchKey  = $withSearch ? ('data-key="' . zget($plansPinYin, $plan, '') . '"') : '';
-                    $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
-                    echo html::a('#', $planLabel, '', "$searchKey title='{$plan}' onclick=\"setFormAction('$actionLink', 'hiddenwin', '#productStoryForm')\" onmouseover=\"setBadgeStyle(this, true);\" onmouseout=\"setBadgeStyle(this, false)\"");
-                }
-                ?>
-              </div>
-            </div>
-          </div>
-          <?php endif;?>
 
           <?php if($canBatchAssignTo):?>
           <div class="btn-group dropup">

extension/lite/story/ext/lang/zh-cn/lite.php

@@ -1,2 +1,3 @@
 <?php
+$lang->story->module   = '所属目录';
 $lang->story->children = '子目标';

extension/lite/task/ext/view/batchcreate.lite.html.hook.php

@@ -0,0 +1,6 @@
+<script>
+$(function()
+{
+    for(var index = 0; index <= 9; index++) $('#batchCreateForm').append(`<input type="hidden" name="vision[${index}]" id="vision[${index}]" value="lite">`);
+});
+</script>

extension/lite/task/ext/view/create.lite.html.hook.php

@@ -0,0 +1,6 @@
+<script>
+$(function()
+{
+    $('.main-form tr.hide > td').append('<input type="hidden" name="vision" id="vision" value="lite">');
+});
+</script>

module/task/model.php

@@ -316,6 +316,7 @@ class taskModel extends model
             $data[$i]->openedBy   = $this->app->user->account;
             $data[$i]->openedDate = $now;
             $data[$i]->parent     = $tasks->parent[$i];
+            $data[$i]->vision     = isset($tasks->vision[$i]) ? $tasks->vision[$i] : 'common';
             if($story) $data[$i]->storyVersion = $this->loadModel('story')->getVersion($data[$i]->story);
             if($assignedTo) $data[$i]->assignedDate = $now;
             if(strpos($this->config->task->create->requiredFields, 'estStarted') !== false and empty($estStarted)) $data[$i]->estStarted = '';
@@ -2150,6 +2151,7 @@ class taskModel extends model
             ->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')
             ->leftJoin(TABLE_PROJECT)->alias('t4')->on("t1.project = t4.id")
             ->where('t1.deleted')->eq(0)
+            ->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
             ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi()
             ->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()
             ->beginIF($type == 'finishedBy')
@@ -2197,6 +2199,7 @@ class taskModel extends model
             ->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id')
             ->where('t1.assignedTo')->eq($account)
             ->andWhere('t1.deleted')->eq(0)
+            ->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
             ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
             ->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi()
             ->query();
@@ -2227,6 +2230,7 @@ class taskModel extends model
             ->orWhere('t3.status')->eq('suspended')
             ->markRight(1)
             ->andWhere('t1.deleted')->eq(0)
+            ->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
             ->andWhere('t2.deleted')->eq(0)
             ->beginIF($this->config->systemMode == 'new')->andWhere('t3.deleted')->eq(0)->fi()
             ->fetchAll('id');