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

module/project/view/story.html.php

@@ -81,13 +81,13 @@
           $param = "projectID={$project->id}&story={$story->id}&moduleID={$story->module}";
 
           $lang->task->create = $lang->project->wbs;
-          common::printIcon('task', 'create', $param, '', 'list', 'sitemap');
+          common::printIcon('task', 'create', $param, '', 'list', 'smile');
 
           $lang->task->batchCreate = $lang->project->batchWBS;
           common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack');
 
           $lang->testcase->batchCreate = $lang->testcase->create;
-          if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'smile');
+          if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap');
 
           if(common::hasPriv('project', 'unlinkStory'))
           {

module/story/control.php

@@ -157,6 +157,7 @@ class story extends control
         $this->view->source           = $source;
         $this->view->pri              = $pri;
         $this->view->productID        = $productID;
+        $this->view->projectID        = $projectID;
         $this->view->estimate         = $estimate;
         $this->view->storyTitle       = $title;
         $this->view->spec             = $spec;

module/story/view/create.html.php

@@ -93,7 +93,7 @@
       <tr>
         <th><?php echo $lang->story->reviewedBy;?></th>
         <td><?php echo html::select('assignedTo', $users, '', "class='form-control chosen'");?></td>
-        <td><?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'");?></td>
+        <td><?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'" . ($projectID > 0 ? " checked='checked'" : ""));?></td>
       </tr>  
        <tr>
         <th><nobr><?php echo $lang->story->mailto;?></nobr></th>

module/task/control.php

@@ -387,7 +387,9 @@ class task extends control
      */
     public function view($taskID)
     {
-        $task = $this->task->getById($taskID, true);
+        $task            = $this->task->getById($taskID, true);
+        $story           = $this->story->getById($task->story);
+        $task->storySpec = ($story != null) ? $story->spec : '';
         if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
 
         /* Update action. */

module/task/lang/en.php

@@ -36,6 +36,7 @@ $lang->task->id                = 'ID';
 $lang->task->project           = 'Project';
 $lang->task->module            = 'Module';
 $lang->task->story             = 'Story';
+$lang->task->storySpec         = 'Story desc';
 $lang->task->storyVersion      = 'Version';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';

module/task/lang/zh-cn.php

@@ -36,6 +36,7 @@ $lang->task->id                = '编号';
 $lang->task->project           = '所属项目';
 $lang->task->module            = '所属模块';
 $lang->task->story             = '相关需求';
+$lang->task->storySpec         = '需求描述';
 $lang->task->storyVersion      = '需求版本';
 $lang->task->name              = '任务名称';
 $lang->task->type              = '任务类型';

module/task/view/view.html.php

@@ -69,6 +69,10 @@
         <legend><?php echo $lang->task->legendDesc;?></legend>
         <div class='article-content'><?php echo $task->desc;?></div>
       </fieldset>
+      <fieldset>
+        <legend><?php echo $lang->task->storySpec;?></legend>
+        <div class='article-content'><?php echo $task->storySpec;?></div>
+      </fieldset>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'> <?php if(!$task->deleted) echo $actionLinks;?></div>

module/tree/model.php

@@ -636,7 +636,7 @@ class treeModel extends model
         }
         else
         {
-            if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit',   "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'data-toggle="modal" data-type="ajax" data-width="400"');
+            if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit',   "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'data-toggle="modal" data-type="ajax" data-width="500"');
             if(common::hasPriv('tree', 'browse') and strpos($this->config->tree->noBrowse, ",$module->type,") === false) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'browse', "root={$module->root}&type=$type&module={$module->id}"), $this->lang->tree->child);
             if(common::hasPriv('tree', 'delete')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'delete', "root={$module->root}&module={$module->id}"), $this->lang->delete, 'hiddenwin');
             if(common::hasPriv('tree', 'updateorder')) $linkHtml .= ' ' . html::input("orders[$module->id]", $module->order, 'class="text-center w-30px form-control inline input-sm"');

module/tree/view/edit.html.php

@@ -11,8 +11,8 @@
  */
 ?>
 <?php
-$webRoot      = $this->app->getWebRoot();
-$jsRoot       = $webRoot . "js/";
+$webRoot = $this->app->getWebRoot();
+$jsRoot  = $webRoot . "js/";
 ?>
 <?php include '../../common/view/chosen.html.php';?>
 <div class='modal-dialog w-500px'>
@@ -23,7 +23,7 @@ $jsRoot       = $webRoot . "js/";
         <strong><small class='text-muted'><?php echo html::icon($lang->icons['edit']);?></small> <?php echo $lang->tree->edit;?></strong>
       </div>
     </div>
-    <form class='form-condensed' method='post' class='mt-10px' id='dataform'>
+    <form action="<?php echo inlink('edit', 'module=' . $module->id .'&type=' .$type);?>" target='hiddenwin' class='form-condensed' method='post' class='mt-10px' id='dataform'>
       <table class='table table-form'> 
         <?php $hidden = ($type != 'story' and $module->type == 'story');?>
         <tr <?php if($hidden) echo "style='display:none'";?>>