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

module/task/config.php

@@ -36,7 +36,6 @@ $config->task->exportFields = '
     closedBy, closedDate, closedReason,
     lastEditedBy, lastEditedDate,files
     ';
-if($config->global->flow == 'onlyTask') $config->task->exportFields = str_replace(array(' story,'), '', $config->task->exportFields);
 
 $config->task->customCreateFields      = 'story,estStarted,deadline,mailto,pri,estimate'; 
 $config->task->customBatchCreateFields = 'module,story,assignedTo,estimate,estStarted,deadline,desc,pri'; 
@@ -47,13 +46,6 @@ $config->task->custom->createFields      = $config->task->customCreateFields;
 $config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri';
 $config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason';
 
-if($config->global->flow == 'onlyTask')
-{
-    $config->task->customCreateFields        = str_replace(array('story,'), '', $config->task->customCreateFields);
-    $config->task->customBatchCreateFields   = str_replace(array('story,'), '', $config->task->customBatchCreateFields);
-    $config->task->custom->batchCreateFields = str_replace(array('story,'), '', $config->task->custom->batchCreateFields);
-}
-
 $config->task->datatable = new stdclass();
 $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions');
 

module/task/control.php

@@ -23,13 +23,6 @@ class task extends control
         $this->loadModel('project');
         $this->loadModel('story');
         $this->loadModel('tree');
-
-        if($this->config->global->flow == 'onlyTask')
-        {
-            $this->config->task->customCreateFields        = str_replace(array('story,'), '', $this->config->task->customCreateFields);
-            $this->config->task->customBatchCreateFields   = str_replace(array('story,'), '', $this->config->task->customBatchCreateFields);
-            $this->config->task->custom->batchCreateFields = str_replace(array('story,'), '', $this->config->task->custom->batchCreateFields);
-        }
     }
 
     /**

module/task/view/batchcreate.html.php

@@ -22,7 +22,7 @@
       <?php echo $lang->task->batchCreate;?>
       <?php endif;?>
     </h2>
-    <?php if($project->type != 'ops' && $config->global->flow != 'onlyTask'):?>
+    <?php if($project->type != 'ops'):?>
     <a class="checkbox-primary pull-left" id='zeroTaskStory' href='javascript:toggleZeroTaskStory();'>
       <label><?php echo $lang->story->zeroTask;?></label>
     </a>
@@ -49,7 +49,7 @@
       }
   }
   $colspan     = count($visibleFields) + 3;
-  $hiddenStory = ((isonlybody() and $storyID) || $config->global->flow == 'onlyTask') ? ' hidden' : '';
+  $hiddenStory = (isonlybody() and $storyID) ? ' hidden' : '';
   if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
   ?>
   <form method='post' class='load-indicator batch-actions-form form-ajax' enctype='multipart/form-data' id="batchCreateForm">

module/task/view/create.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/sortable.html.php';?>
-<?php js::set('toTaskList', $config->global->flow == 'onlyTask' || !empty($task->id));?>
+<?php js::set('toTaskList', !empty($task->id));?>
 <style>.title-group .has-icon-right{min-width:700px}</style>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
@@ -70,7 +70,7 @@
           <td><?php echo html::hidden('status', 'wait');?></td>
         </tr>
         <?php $this->printExtendFields('', 'table');?>
-        <?php if(strpos(",$showFields,", ',story,') !== false and $config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
+        <?php if(strpos(",$showFields,", ',story,') !== false and $project->type != 'ops'):?>
         <tr>
           <th><?php echo $lang->task->story;?></th>
           <td colspan='3'>
@@ -85,7 +85,7 @@
           </td>
         </tr>
         <?php endif;?>
-        <?php if($stories and $config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
+        <?php if($stories and $project->type != 'ops'):?>
         <tr id='testStoryBox' class='hidden'>
           <th><?php echo $lang->task->selectTestStory;?></th>
           <td colspan='3'>
@@ -144,10 +144,8 @@
                   <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#name"  data-provide="colorpicker">
                 </div>
                 <?php echo html::input('name', $task->name, "class='form-control' required");?>
-                <?php if($config->global->flow != 'onlyTask'):?>
                 <a href='javascript:copyStoryTitle();' id='copyButton' class='input-control-icon-right'><?php echo $lang->task->copyStoryTitle;?></a>
                 <?php echo html::hidden("storyEstimate") . html::hidden("storyDesc") . html::hidden("storyPri");?>
-                <?php endif;?>
               </div>
               <?php if(strpos(",$showFields,", ',pri,') !== false): // begin print pri selector?>
               <span class="input-group-addon fix-border br-0"><?php echo $lang->task->pri;?></span>
@@ -237,9 +235,9 @@
           </td>
         </tr>
         <?php endif;?>
-        <tr <?php echo $config->global->flow == 'onlyTask' ? "class='hidden'" : '';?> id='after-tr'>
+        <tr id='after-tr'>
           <th><?php echo $lang->task->afterSubmit;?></th>
-          <td colspan='3'><?php echo html::radio('after', $lang->task->afterChoices, $config->global->flow == 'onlyTask' || !empty($task->id) ? 'toTaskList' : 'continueAdding');?></td>
+          <td colspan='3'><?php echo html::radio('after', $lang->task->afterChoices, !empty($task->id) ? 'toTaskList' : 'continueAdding');?></td>
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>

module/task/view/edit.html.php

@@ -107,7 +107,7 @@
                   </div>
                 </td>
               </tr>
-              <?php if($config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
+              <?php if($project->type != 'ops'):?>
               <tr>
                 <th><?php echo $lang->task->story;?></th>
                 <td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, "class='form-control chosen'");?></span></td>

module/task/view/view.html.php

@@ -227,7 +227,7 @@
                   ?>
                   <td title='<?php echo $moduleTitle?>'><?php echo $printModule?></td>
                 </tr>
-                <?php if($config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
+                <?php if($project->type != 'ops'):?>
                 <tr class='nofixed'>
                   <th><?php echo $lang->task->story;?></th>
                   <td>