Merge branch 'sprint/180_xieqiyu_18166'

config/zentaopms.php

@@ -296,5 +296,5 @@ $config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme');
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
-$config->programPriv->scrum     = array('projectstory', 'projectrelease', 'project', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
+$config->programPriv->scrum     = array('story', 'projectstory', 'projectrelease', 'project', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
 $config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));

module/bug/view/edit.html.php

@@ -268,7 +268,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
               <tbody>
                 <tr class='text-top'>
                   <th class='thWidth'><?php echo $lang->bug->linkBug;?></th>
-                  <td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
+                  <td><?php if(common::hasPriv('bug', 'linkBugs')) echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
                 </tr>
                 <tr>
                   <th></th>

module/doc/lang/en.php

@@ -106,7 +106,7 @@ $lang->doc->custom         = 'Custom Document Library';
 $lang->doc->customAB       = 'Custom Doc Lib';
 $lang->doc->createLib      = 'Document Library';
 $lang->doc->allLibs        = 'Library List';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon} Libraries";
+$lang->doc->objectLibs     = "Document View of Library";
 $lang->doc->showFiles      = 'Attachments';
 $lang->doc->editLib        = 'Edit Document Library';
 $lang->doc->deleteLib      = 'Delete Document Library';

module/doc/lang/zh-cn.php

@@ -106,7 +106,7 @@ $lang->doc->custom         = '自定义文档库';
 $lang->doc->customAB       = '自定义库';
 $lang->doc->createLib      = '创建文档库';
 $lang->doc->allLibs        = '文档库列表';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon}库列表";
+$lang->doc->objectLibs     = "文档库文档详情";
 $lang->doc->showFiles      = '附件库';
 $lang->doc->editLib        = '编辑文档库';
 $lang->doc->deleteLib      = '删除文档库';

module/productplan/lang/en.php

@@ -122,7 +122,7 @@ $lang->productplan->endLetterChild       = "The completion date of the child pla
 $lang->productplan->noLinkedProject      = "The current product has not been linked with a project. Please enter the list of the product to link or create a project.";
 $lang->productplan->enterProjectList     = "Enter the list of the product";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
-$lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.", ;
+$lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
 $lang->productplan->endGreaterParentTip  = "The completion date of the child plan[%s]: %s, cannot be greater than the completion date of the parent plan: %s.";
 

module/project/config.php

@@ -132,12 +132,13 @@ $config->project->maxCheckList = new stdclass();
 $config->project->maxCheckList->scrum     = array('bug', 'execution', 'build', 'doc', 'release', 'testtask', 'case', 'issue', 'risk', 'meeting');
 $config->project->maxCheckList->waterfall = array('execution', 'design', 'doc', 'bug', 'case', 'build', 'release', 'testtask', 'review', 'build', 'researchplan', 'issue', 'risk', 'opportunity', 'auditplan', 'gapanalysis', 'meeting');
 
-$config->project->excludedPriv['project']    = array('index', 'browse', 'kanban', 'create', 'batchEdit', 'qa', 'updateOrder', 'createGuide', 'programTitle', 'export');
-$config->project->excludedPriv['bug']        = array('browse', 'batchChangePlan', 'batchCreate', 'batchEdit', 'batchConfirm', 'batchResolve', 'batchClose', 'batchActivate', 'report', 'batchChangeModule', 'batchChangeBranch');
-$config->project->excludedPriv['testcase']   = array('browse', 'batchChangeModule', 'batchChangeBranch');
-$config->project->excludedPriv['testtask']   = array('browse', 'view', 'start', 'activate', 'block', 'close');
-$config->project->excludedPriv['doc']        = array('catalog', 'index');
-$config->project->excludedPriv['repo']       = array('edit', 'delete', 'maintain', 'setRules');
-$config->project->excludedPriv['testreport'] = array('browse');
-$config->project->excludedPriv['auditplan']  = array('delete');
-if(!isset($config->maxVersion)) $config->project->excludedPriv['stakeholder'] = array('issue', 'viewIssue', 'userIssue');
+$config->project->removePriv['project']    = array('index', 'browse', 'kanban', 'create', 'batchEdit', 'qa', 'updateOrder', 'createGuide', 'programTitle', 'export');
+$config->project->removePriv['story']      = array('report', 'linkStory', 'batchChangeBranch', 'batchChangeModule', 'batchToTask', 'processStoryChange', 'track', 'tasks', 'bugs', 'cases');
+$config->project->removePriv['bug']        = array('browse', 'batchChangePlan', 'batchCreate', 'batchEdit', 'batchConfirm', 'batchResolve', 'batchClose', 'batchActivate', 'report', 'batchChangeModule', 'batchChangeBranch');
+$config->project->removePriv['testcase']   = array('browse', 'batchChangeModule', 'batchChangeBranch');
+$config->project->removePriv['testtask']   = array('browse', 'view', 'start', 'activate', 'block', 'close');
+$config->project->removePriv['doc']        = array('browse', 'view', 'catalog', 'index');
+$config->project->removePriv['repo']       = array('edit', 'delete', 'maintain', 'setRules');
+$config->project->removePriv['testreport'] = array('browse');
+$config->project->removePriv['auditplan']  = array('delete');
+if(!isset($config->maxVersion)) $config->project->removePriv['stakeholder'] = array('issue', 'viewIssue', 'userIssue');

module/project/view/managepriv.html.php

@@ -29,42 +29,6 @@ td.menus + td {border-left: 0;}
 .menus a {margin-left: 10px;}
 </style>
 
-<?php if($group->role == 'limited'):?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'>
-    <a href='javascript:;' class='btn btn-link btn-active-text'><span class='text'><?php echo $group->name;?></span></a>
-  </div>
-</div>
-<div id='mainContent' class='main-content'>
-  <form class="load-indicator main-form form-ajax" id="managePrivForm" method="post" target='hiddenwin'>
-    <table class='table table-hover table-striped table-bordered'>
-      <thead>
-        <tr class='text-center'>
-          <th><?php echo $lang->group->module;?></th>
-          <th><?php echo $lang->group->method;?></th>
-        </tr>
-      </thead>
-      <tr class='<?php echo cycle('even, bg-gray');?>'>
-        <th class='text-right thWidth'><?php echo $lang->my->common;?></th>
-        <td id='my' class='pv-10px'>
-          <div class='checkbox-primary'>
-            <input type='checkbox' name='actions[my][]' value='limited' <?php if(isset($groupPrivs['my']['limited'])) echo "checked";?> />
-            <label class='priv' id="my-limited"><?php echo $lang->my->limited;?></label>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th class='text-right'></th>
-        <td class='form-actions'>
-          <?php echo html::submitButton('', "onclick='setNoChecked()'");?>
-          <?php echo html::backButton();?>
-          <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
-        </td>
-      </tr>
-    </table>
-  </form>
-</div>
-<?php else:?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
   <span id='groupName'><i class='icon-lock'></i> <?php echo $group->name;?> <i class="icon icon-chevron-right"></i></span>
@@ -134,7 +98,7 @@ td.menus + td {border-left: 0;}
           </div>
         </th>
         <td class='form-actions' colspan='2'>
-          <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton();?>
           <?php echo html::backButton();?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
         </td>
@@ -142,7 +106,6 @@ td.menus + td {border-left: 0;}
     </table>
   </form>
 </div>
-<?php endif;?>
 <?php js::set('groupID', $groupID);?>
 <?php js::set('menu', $menu);?>
 <script>

module/stakeholder/view/browse.html.php

@@ -64,7 +64,11 @@
           <?php $stakeholder->name = $stakeholder->companyName ? $stakeholder->companyName . '/' . $stakeholder->name : $stakeholder->name;?>
           <?php $isKey = $stakeholder->key ? " <i class='icon icon-star-empty'></i>" : '';?>
           <?php $title = $stakeholder->key ? $stakeholder->name . '(' . $lang->stakeholder->isKey . ')' : $stakeholder->name;?>
-          <td><?php common::printLink('stakeholder', 'view', "id=$stakeholder->id", $stakeholder->name . $isKey, '', "title=$title");?></td>
+          <?php if(common::hasPriv('stakeholder', 'view')):?>
+          <td><?php echo html::a($this->createLink('stakeholder', 'view', "id=$stakeholder->id"), $stakeholder->name . $isKey, '', "title={$stakeholder->name}");?></td>
+          <?php else:?>
+          <td title='<?php echo $stakeholder->name;?>'><?php echo $stakeholder->name . $isKey;?></td>
+          <?php endif;?>
           <td title='<?php echo zget($lang->stakeholder->typeList, $stakeholder->type, '');?>'><?php echo zget($lang->stakeholder->typeList, $stakeholder->type, '');?></td>
           <td title="<?php echo $stakeholder->phone;?>"><?php echo $stakeholder->phone;?></td>
           <td title="<?php echo $stakeholder->qq;?>"><?php echo $stakeholder->qq;?></td>

module/story/control.php

@@ -26,8 +26,6 @@ class story extends control
         $this->loadModel('tree');
         $this->loadModel('user');
         $this->loadModel('action');
-
-        if($this->app->tab == 'project') $this->app->rawModule = 'projectstory';
     }
 
     /**
@@ -1028,7 +1026,7 @@ class story extends control
         }
         elseif($from == 'project')
         {
-            $this->loadModel('project')->setMenu($param);
+            $this->loadModel('project')->setMenu($this->session->project);
         }
         elseif($from == 'qa')
         {