* Code for finish task #83722.

2023-02-07 16:29:02 +08:00
parent 269c7a517e
commit 52568a67be
15 changed files with 131 additions and 120 deletions
@@ -84,7 +84,7 @@ $lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
 $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';

 $lang->admin->menuList->feature['subMenu']['my']          = array('link' => "{$lang->my->common}|custom|set|module=todo", 'exclude' => 'set,required');
-$lang->admin->menuList->feature['subMenu']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product|", 'exclude' => 'set,required');
+$lang->admin->menuList->feature['subMenu']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product|", 'exclude' => 'set,required', 'alias' => 'browsestoryconcept,product');
 $lang->admin->menuList->feature['subMenu']['execution']   = array('link' => "{$lang->execution->common}|custom|execution|");
 $lang->admin->menuList->feature['subMenu']['qa']          = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required');
 $lang->admin->menuList->feature['subMenu']['kanban']      = array('link' => "{$lang->kanban->common}|custom|kanban|");
@@ -95,7 +95,7 @@ $lang->admin->menuList->feature['tabMenu']['my']['todo']  = array('link' => "{$l
 $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed");
 if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));

-$lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'));
+$lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept');

 $lang->admin->menuList->feature['menuOrder']['5']  = 'my';
 $lang->admin->menuList->feature['menuOrder']['10'] = 'product';
@@ -277,6 +277,7 @@ class adminModel extends model
                if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
                {
                    if(strpos(',todo,block,', $paramName) !== false) $subMenuKey = 'my';
+                    if(strpos(',product,', $paramName) !== false) $subMenuKey = 'product';
                    if($this->config->vision == 'lite' and $paramName == 'task') $subMenuKey = 'my';
                    if(isset($subMenuKey)) $this->lang->admin->menuList->$menuKey['subMenu'][$subMenuKey]['subModule'] = $moduleName;
                }
@@ -9,10 +9,20 @@

      list($tabModule, $tabMethod, $tabParams) = $link;

-      $name      = $lang->custom->object[$tabMenuKey];
-      $paramName = $this->app->rawParams ? reset($this->app->rawParams) : '';
-      $active    = ($tabMethod == $tabMenuKey and strpos(',required,set,', ",$tabMethod,",) === false) ? 'btn-active-text' : '';
-      $active    = ($paramName == $tabMenuKey and strpos(',required,set,', ",$tabMethod,",) !== false) ? 'btn-active-text' : $active;
+      $name          = $lang->custom->object[$tabMenuKey];
+      $paramName     = $this->app->rawParams ? reset($this->app->rawParams) : '';
+      $currentMethod = $app->rawMethod;
+      $active        = '';
+      if(strpos(',required,set,', ",$currentMethod,",) === false)
+      {
+          if($currentMethod == $tabMenuKey) $active = 'btn-active-text';
+          if(isset($tabMenu['alias']) and strpos(",{$tabMenu['alias']},", ",$currentMethod",) !== false) $active = 'btn-active-text';
+      }
+      elseif($paramName == $tabMenuKey)
+      {
+          $active = 'btn-active-text';
+      }
+
      common::printLink($tabModule, $tabMethod, $tabParams, "<span class='text'>{$name}</span>", '', "class='btn btn-link {$active}' id='{$tabMenuKey}Tab'");
  }
  ?>
@@ -70,3 +70,5 @@ $config->custom->fieldList['testtask']               = 'owner,pri,desc';
 $config->custom->fieldList['doc']                    = 'keywords,content';
 $config->custom->fieldList['user']['create']         = 'dept,role,email,commiter';
 $config->custom->fieldList['user']['edit']           = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
+
+$config->custom->notSetMethods = array('required', 'browsestoryconcept', 'product');
@@ -382,7 +382,7 @@ class custom extends control
        $this->view->position[] = $this->lang->custom->required;

        $this->view->requiredFields = $requiredFields;
-        $this->view->moduleName     = $moduleName;
+        $this->view->module         = $moduleName;
        $this->display();
    }

@@ -439,6 +439,7 @@ class custom extends control
        $this->view->title      = $this->lang->custom->browseStoryConcept;
        $this->view->position[] = $this->lang->custom->browseStoryConcept;
        $this->view->URSRList   = $this->custom->getURSRList();
+        $this->view->module     = 'product';

        $this->display();
    }
@@ -576,9 +577,10 @@ class custom extends control
            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
        }

-        $this->view->title      = $this->lang->custom->product;
+        $this->view->title      = $this->lang->custom->productName;
        $this->view->position[] = $this->lang->custom->common;
        $this->view->position[] = $this->view->title;
+        $this->view->module     = 'product';

        $this->display();
    }
@@ -1 +1,3 @@
+.table-form>tbody>tr>th{text-align: center}
 .c-default {width: 70px;}
+.setBtn {margin-top: -5px;}
@@ -22,7 +22,7 @@ $lang->custom->score                = 'Score';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Reset Score';
 $lang->custom->scoreTitle           = 'Point Feature';
-$lang->custom->product              = $lang->productCommon;
+$lang->custom->productName          = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
 $lang->custom->tips                 = 'Tips';
@@ -131,6 +131,11 @@ $lang->custom->project->currencySetting    = 'Currency Setting';
 $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';

+$lang->custom->product = new stdClass();
+$lang->custom->product->fields['required']           = $lang->custom->required;
+$lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
+$lang->custom->product->fields['product']            = 'Close Setting';
+
 $lang->custom->story = new stdClass();
 $lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priority';
@@ -22,7 +22,7 @@ $lang->custom->score                = 'Point';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Reset Points';
 $lang->custom->scoreTitle           = 'Point Feature';
-$lang->custom->product              = $lang->productCommon;
+$lang->custom->productName          = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
 $lang->custom->tips                 = 'Tips';
@@ -131,6 +131,11 @@ $lang->custom->project->currencySetting    = 'Currency Setting';
 $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';

+$lang->custom->product = new stdClass();
+$lang->custom->product->fields['required']           = $lang->custom->required;
+$lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
+$lang->custom->product->fields['product']            = 'Close Setting';
+
 $lang->custom->story = new stdClass();
 $lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priority';
@@ -22,7 +22,7 @@ $lang->custom->score                = 'Point';
 $lang->custom->timezone             = 'Timezone';
 $lang->custom->scoreReset           = 'Réinit Points';
 $lang->custom->scoreTitle           = 'Fonctionnalité des Points';
-$lang->custom->product              = $lang->productCommon;
+$lang->custom->productName          = $lang->productCommon;
 $lang->custom->convertFactor        = 'Convert factor';
 $lang->custom->region               = 'Interval';
 $lang->custom->tips                 = 'Tips';
@@ -131,6 +131,11 @@ $lang->custom->project->currencySetting    = 'Currency Setting';
 $lang->custom->project->defaultCurrency    = 'Default Currency';
 $lang->custom->project->fields['unitList'] = 'Unit List';

+$lang->custom->product = new stdClass();
+$lang->custom->product->fields['required']           = $lang->custom->required;
+$lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
+$lang->custom->product->fields['product']            = 'Close Setting';
+
 $lang->custom->story = new stdClass();
 $lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priorité';
@@ -22,7 +22,7 @@ $lang->custom->score                = '积分';
 $lang->custom->timezone             = '时区';
 $lang->custom->scoreReset           = '重置积分';
 $lang->custom->scoreTitle           = '积分功能';
-$lang->custom->product              = $lang->productCommon;
+$lang->custom->productName          = $lang->productCommon;
 $lang->custom->convertFactor        = '换算系数';
 $lang->custom->region               = '区间';
 $lang->custom->tips                 = '提示语';
@@ -131,6 +131,11 @@ $lang->custom->project->currencySetting    = '货币设置';
 $lang->custom->project->defaultCurrency    = '默认货币';
 $lang->custom->project->fields['unitList'] = '预算单位';

+$lang->custom->product = new stdClass();
+$lang->custom->product->fields['required']           = $lang->custom->required;
+$lang->custom->product->fields['browsestoryconcept'] = '需求概念';
+$lang->custom->product->fields['product']            = '关闭设置';
+
 $lang->custom->story = new stdClass();
 $lang->custom->story->fields['categoryList']     = '类型';
 $lang->custom->story->fields['priList']          = '优先级';
@@ -9,49 +9,50 @@
 * @version     $Id: browsestoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $
 */
 ?>
-<?php include '../../common/view/header.html.php';?>
-<style>
-.table-form>tbody>tr>th{text-align: center}
-</style>
-<div id='mainMenu' class='clearfix'>
-  <div class='pull-right'>
-    <?php if(common::hasPriv('custom', 'setstoryconcept')) echo html::a($this->createLink('custom', 'setstoryconcept', '', '', true), $lang->custom->setStoryConcept, '', "class='btn btn-primary iframe' data-width=" . ($this->config->URAndSR ? "590px" : "405px"));?>
-  </div>
-</div>
+<?php include 'header.html.php';?>
 <div id='mainContent' class='main-row'>
+  <?php include 'sidebar.html.php';?>
  <div class='main-col main-content main-table'>
-      <table class='table table-form'>
-        <thead>
-          <tr>
-            <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>
-            <th class='c-default text-center'><?php echo $lang->custom->default;?> </th>
-            <?php endif;?>
-            <?php if($this->config->URAndSR):?>
-            <th class='text-left'><?php echo $lang->custom->URConcept;?> </th>
-            <?php endif;?>
-            <th class='text-left'><?php echo $lang->custom->SRConcept;?> </th>
-            <th class='c-actions-2 text-left'><?php echo $lang->actions;?> </th>
-          </tr>
-        </thead>
-        <tbody>
-        <?php foreach($URSRList as $key => $URSR):?>
-          <tr>
-            <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>
-            <td class='text-center'><input type="radio" name='default' value='<?php echo $key;?>' <?php if($key == $config->custom->URSR) echo 'checked';?>></td>
-            <?php endif;?>
-            <?php if($this->config->URAndSR):?>
-            <td class='text-left URBox'><?php echo $URSR['URName'];?></td>
-            <?php endif;?>
-            <td class='text-left SRBox'><?php echo $URSR['SRName'];?></td>
-            <td class='c-actions'>
-              <?php $disabled = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
-              <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' data-width=" . ($this->config->URAndSR ? "480px" : "330px") . " title={$lang->edit}");?>
-              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
-            </td>
-          </tr>
-        <?php endforeach;?>
-        </tbody>
-      </table>
+    <div>
+      <div class='pull-left'>
+        <strong><?php echo $lang->custom->product->fields['browsestoryconcept']?></strong>
+      </div>
+      <div class='pull-right setBtn'>
+        <?php if(common::hasPriv('custom', 'setstoryconcept')) echo html::a($this->createLink('custom', 'setstoryconcept', '', '', true), $lang->custom->setStoryConcept, '', "class='btn btn-primary iframe' data-width=" . ($this->config->URAndSR ? "590px" : "405px"));?>
+      </div>
+    </div>
+    <table class='table table-form'>
+      <thead>
+        <tr>
+          <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>
+          <th class='c-default text-center'><?php echo $lang->custom->default;?> </th>
+          <?php endif;?>
+          <?php if($this->config->URAndSR):?>
+          <th class='text-left'><?php echo $lang->custom->URConcept;?> </th>
+          <?php endif;?>
+          <th class='text-left'><?php echo $lang->custom->SRConcept;?> </th>
+          <th class='c-actions-2 text-left'><?php echo $lang->actions;?> </th>
+        </tr>
+      </thead>
+      <tbody>
+      <?php foreach($URSRList as $key => $URSR):?>
+        <tr>
+          <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>
+          <td class='text-center'><input type="radio" name='default' value='<?php echo $key;?>' <?php if($key == $config->custom->URSR) echo 'checked';?>></td>
+          <?php endif;?>
+          <?php if($this->config->URAndSR):?>
+          <td class='text-left URBox'><?php echo $URSR['URName'];?></td>
+          <?php endif;?>
+          <td class='text-left SRBox'><?php echo $URSR['SRName'];?></td>
+          <td class='c-actions'>
+            <?php $disabled = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
+            <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' data-width=" . ($this->config->URAndSR ? "480px" : "330px") . " title={$lang->edit}");?>
+            <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
+          </td>
+        </tr>
+      <?php endforeach;?>
+      </tbody>
+    </table>
  </div>
 </div>
 <script>
@@ -10,33 +10,36 @@
 */
 ?>
 <?php include 'header.html.php';?>
-<div id='mainContent' class='main-content'>
-  <form class="load-indicator main-form form-ajax" method='post'>
-    <table class='table table-form'>
-      <tr>
-        <th class='w-150px'><?php echo $lang->custom->closedProduct;?></th>
-        <td class='w-300px text-left'>
-          <?php $checkedKey = isset($config->CRProduct) ? $config->CRProduct : 0;?>
-          <?php foreach($lang->custom->CRProduct as $key => $value):?>
-          <label class="radio-inline"><input type="radio" name="product" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="product<?php echo $key;?>"><?php echo $value;?></label>
-          <?php endforeach;?>
-        </td>
-        <td></td>
-      </tr>
-      <tr>
-        <th></th>
-        <td colspan="2" id="readOnlyOfProduct">
-          <i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfProduct;?>
-        </td>
-      </tr>
-      <tr>
-        <th></th>
-        <td class='form-actions'>
-          <?php echo html::submitButton();?>
-        </td>
-      </tr>
-    </table>
-  </form>
+<div id='mainContent' class='main-row'>
+  <?php include 'sidebar.html.php';?>
+  <div class='main-col main-content'>
+    <form class="load-indicator main-form form-ajax" method='post'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-150px'><?php echo $lang->custom->closedProduct;?></th>
+          <td class='w-300px text-left'>
+            <?php $checkedKey = isset($config->CRProduct) ? $config->CRProduct : 0;?>
+            <?php foreach($lang->custom->CRProduct as $key => $value):?>
+            <label class="radio-inline"><input type="radio" name="product" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="product<?php echo $key;?>"><?php echo $value;?></label>
+            <?php endforeach;?>
+          </td>
+          <td></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td colspan="2" id="readOnlyOfProduct">
+            <i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfProduct;?>
+          </td>
+        </tr>
+        <tr>
+          <th></th>
+          <td class='form-actions'>
+            <?php echo html::submitButton();?>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
 </div>
 <script>
 $(function()
@@ -12,26 +12,12 @@
 ?>
 <?php include 'header.html.php';?>
 <div id='mainContent' class='main-row'>
-  <div class='side-col' id='sidebar'>
-    <div class='cell'>
-      <div class='list-group'>
-        <?php
-        foreach($lang->custom->{$moduleName}->fields as $key => $value)
-        {
-            $method = $key == 'required' ? 'required' : 'set';
-            $params = $key == 'required' ? "module=$moduleName" : "module=$moduleName&field=$key";
-            $active = $key == 'required' ? 'active' : '';
-            if(common::hasPriv('custom', $method)) echo html::a(inlink($method, $params), $value, '', "class='$active'");
-        }
-        ?>
-      </div>
-    </div>
-  </div>
+  <?php include 'sidebar.html.php';?>
  <div class='main-col main-content'>
    <form class="load-indicator main-form form-ajax" method='post'>
      <div class='main-header'>
        <div class='heading'>
-          <strong><?php echo $lang->custom->object[$moduleName] . $lang->arrow . $lang->custom->$moduleName->fields['required']?></strong>
+          <strong><?php echo $lang->custom->object[$module] . $lang->arrow . $lang->custom->$module->fields['required']?></strong>
        </div>
      </div>
      <table class='table table-form mw-800px'>
@@ -40,18 +26,18 @@
        <tr>
          <th class='thWidth'>
          <?php
-          $fields = $this->custom->getFormFields($moduleName, $method);
+          $fields = $this->custom->getFormFields($module, $method);
          if(empty($fields)) continue;
-          if($moduleName == 'caselib' and $method == 'createcase') continue;
+          if($module == 'caselib' and $method == 'createcase') continue;

          $actionKey = $method . 'Action';
-          if(isset($lang->$moduleName->$actionKey))
+          if(isset($lang->$module->$actionKey))
          {
-              echo $lang->$moduleName->$actionKey . $lang->custom->page;
+              echo $lang->$module->$actionKey . $lang->custom->page;
          }
          else
          {
-              echo $lang->$moduleName->$method . $lang->custom->page;
+              echo $lang->$module->$method . $lang->custom->page;
          }
          ?>
          </th>
@@ -64,7 +50,7 @@
          <th></th>
          <td colspan='2' class='form-actions'>
          <?php echo html::submitButton();?>
-          <?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
+          <?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$module"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
          </td>
        </tr>
      </table>
@@ -48,23 +48,7 @@ EOT;
 </style>
 <?php endif;?>
 <div id='mainContent' class='main-row'>
-  <?php if(!in_array($module, array('block'))):?>
-  <div class='side-col' id='sidebar'>
-    <div class='cell'>
-      <div class='list-group tab-menu'>
-        <?php
-        foreach($lang->custom->{$module}->fields as $key => $value)
-        {
-            $method = $key == 'required' ? 'required' : 'set';
-            $params = $key == 'required' ? "module=$module" : "module=$module&field=$key";
-            $active = $field == $key ? 'active' : '';
-            if(common::hasPriv('custom', $method)) echo html::a(inlink($method, $params), $value, '', "class='$active'");
-        }
-        ?>
-      </div>
-    </div>
-  </div>
-  <?php endif;?>
+  <?php if(!in_array($module, array('block'))) include 'sidebar.html.php';?>
  <div class='main-col main-content'>
    <form class="load-indicator main-form form-ajax" method='post'>
      <div class='main-header'>
@@ -1413,7 +1413,7 @@ $lang->mail->methodOrder[50] = 'resend';
 $lang->resource->custom = new stdclass();
 $lang->resource->custom->index              = 'index';
 $lang->resource->custom->set                = 'set';
-$lang->resource->custom->product            = 'product';
+$lang->resource->custom->product            = 'productName';
 $lang->resource->custom->execution          = 'execution';
 $lang->resource->custom->required           = 'required';
 $lang->resource->custom->restore            = 'restore';