diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index f3a19be1ac..d51baa0e5e 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -34,19 +34,19 @@ $(function() var $dropmenu = $(''); if(typeof(storyType) != 'undefined' && storyType == 'requirement') { - $dropmenu.append("
  • ' data-toggle='modal' data-type='ajax'>datatable->custom?>
    • "); + $dropmenu.append("
  • ' data-toggle='modal' data-type='ajax'>datatable->custom?>
    • "); } else if(typeof(extra) != 'undefined' && extra == 'unsetStory') { - $dropmenu.append("
  • ' data-toggle='modal' data-type='ajax'>datatable->custom?>
    • "); + $dropmenu.append("
  • ' data-toggle='modal' data-type='ajax'>datatable->custom?>
    • "); } else if((currentModule == 'marketreport' || currentModule == 'marketresearch') && currentMethod == 'browse') { - $dropmenu.append("
  • ' data-toggle='modal' data-type='ajax'>datatable->custom?>
    • "); + $dropmenu.append("
  • ' data-toggle='modal' data-type='ajax'>datatable->custom?>
    • "); } else { - $dropmenu.append("
  • datatable->custom?>
    • "); + $dropmenu.append("
  • datatable->custom?>
    • "); } $dropmenu.append("
  • \", true);' id='switchToDatatable'>datatable->switchToDatatable : $lang->datatable->switchToTable;?>
    • "); @@ -83,7 +83,7 @@ $(function() currentMethod: currentMethod, }, success:function(){window.location.reload();}, - url: 'createLink('datatable', 'ajaxSave')?>' + url: 'createLink('datatable', 'ajaxOldSave')?>' }); }); @@ -99,7 +99,7 @@ $(function() dataType: 'json', data: {target: datatableId, name: name, value: value, global: global}, success:function(e){if(reload) window.location.reload();}, - url: 'createLink('datatable', 'ajaxSave')?>' + url: 'createLink('datatable', 'ajaxOldSave')?>' }); $.get(createLink('score', 'ajax', "method=switchToDataTable")); }; @@ -114,7 +114,7 @@ $(function()

    datatable->displaySetting;?>

    -
    '> + '> diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php index 9de1d6f468..88efcf9305 100644 --- a/module/common/view/datatable.html.php +++ b/module/common/view/datatable.html.php @@ -109,7 +109,7 @@ $(document).ready(function() dataType: 'json', data: {target: datatableId, name: name, value: value, global: global}, success:function(e){if(reload) window.location.reload();}, - url: 'createLink('datatable', 'ajaxSave')?>' + url: 'createLink('datatable', 'ajaxOldSave')?>' }); }; diff --git a/module/common/view/dtable.html.php b/module/common/view/dtable.html.php index a7266f2870..d5d93a2ac6 100644 --- a/module/common/view/dtable.html.php +++ b/module/common/view/dtable.html.php @@ -109,7 +109,7 @@ $(document).ready(function() dataType: 'json', data: {target: datatableId, name: name, value: value, global: global}, success:function(e){if(reload) window.location.reload();}, - url: 'createLink('datatable', 'ajaxSave')?>' + url: 'createLink('datatable', 'ajaxOldSave')?>' }); }; diff --git a/module/datatable/control.php b/module/datatable/control.php index 71b855b01f..f089d4e576 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -194,6 +194,119 @@ class datatable extends control $this->display(); } + /** + * Save config + * + * @access public + * @return void + */ + public function ajaxOldSave() + { + if(!empty($_POST)) + { + $account = $this->app->user->account; + if($account == 'guest') return $this->send(array('result' => 'fail', 'target' => $target, 'message' => 'guest.')); + + $name = 'datatable.' . $this->post->target . '.' . $this->post->name; + $this->loadModel('setting')->setItem($account . '.' . $name, $this->post->value); + if($this->post->allModule !== false) $this->setting->setItem("$account.execution.task.allModule", $this->post->allModule); + if($this->post->showBranch !== false) $this->setting->setItem($account . '.' . $this->post->currentModule . '.' . $this->post->currentMethod . '.showBranch', $this->post->showBranch); + if($this->post->global) $this->setting->setItem('system.' . $name, $this->post->value); + + if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => 'dao error.')); + return $this->send(array('result' => 'success')); + } + } + + /** + * custom fields. + * + * @param string $module + * @param string $method + * @param string $extra + * @access public + * @return void + */ + public function ajaxOldCustom(string $module, string $method, string $extra = '') + { + $moduleName = $module; + $target = $module . ucfirst($method); + $mode = isset($this->config->datatable->$target->mode) ? $this->config->datatable->$target->mode : 'table'; + $key = $mode == 'datatable' ? 'cols' : 'tablecols'; + + if($module == 'testtask') + { + $this->loadModel('testcase'); + $this->app->loadConfig('testtask'); + $this->config->testcase->datatable->defaultField = $this->config->testtask->datatable->defaultField; + $this->config->testcase->datatable->fieldList['actions']['width'] = '100'; + $this->config->testcase->datatable->fieldList['status']['width'] = '90'; + } + if($module == 'testcase') + { + $this->loadModel('testcase'); + unset($this->config->testcase->datatable->fieldList['assignedTo']); + } + + $this->view->module = $module; + $this->view->method = $method; + $this->view->mode = $mode; + + $module = zget($this->config->datatable->moduleAlias, "$module-$method", $module); + $setting = ''; + if(isset($this->config->datatable->$target->$key)) $setting = $this->config->datatable->$target->$key; + if(empty($setting)) + { + $this->loadModel($module); + $setting = json_encode($this->config->$module->datatable->defaultField); + } + + $cols = $this->datatable->getOldFieldList($module); + + if($module == 'story' && $extra != 'requirement') unset($cols['SRS']); + + if($extra == 'requirement') + { + unset($cols['plan']); + unset($cols['stage']); + unset($cols['taskCount']); + unset($cols['bugCount']); + unset($cols['caseCount']); + unset($cols['URS']); + + $cols['title']['title'] = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title); + } + + if($moduleName == 'project' and $method == 'bug') + { + $project = $this->loadModel('project')->getByID($this->session->project); + + if(!$project->multiple) unset($cols['execution']); + if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']); + if(!$project->hasProduct) unset($cols['branch']); + } + + if($moduleName == 'execution' and $method == 'bug') + { + $execution = $this->loadModel('execution')->getByID($this->session->execution); + $project = $this->loadModel('project')->getByID($execution->project); + if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']); + if(!$project->hasProduct) unset($cols['branch']); + } + + if($moduleName == 'execution' and $method == 'story') + { + $execution = $this->loadModel('execution')->getByID($this->session->execution); + if(!$execution->hasProduct and !$execution->multiple) unset($cols['plan']); + if(!$execution->hasProduct) unset($cols['branch']); + } + if($extra == 'unsetStory' and isset($cols['story'])) unset($cols['story']); + + $this->view->cols = $cols; + $this->view->setting = $setting; + $this->display(); + } + /** * 恢复自定义项为默认配置。 * Ajax reset cols. diff --git a/module/datatable/model.php b/module/datatable/model.php index 1271ef5329..7a8827da75 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -148,6 +148,121 @@ class datatableModel extends model return $fieldSetting; } + /** + * Get field list. + * + * @param string $module + * @access public + * @return array + */ + public function getOldFieldList(string $module) + { + if(!isset($this->config->$module)) $this->loadModel($module); + if($this->session->hasProduct == 0 and (strpos($this->config->datatable->noProductModule, ",$module,") !== false)) + { + $productIndex = array_search('product', $this->config->$module->datatable->defaultField); + if($productIndex) unset($this->config->$module->datatable->defaultField[$productIndex]); + if(isset($this->config->$module->datatable->fieldList['product'])) unset($this->config->$module->datatable->fieldList['product']); + } + if($this->session->currentProductType === 'normal') unset($this->config->$module->datatable->fieldList['branch']); + foreach($this->config->$module->datatable->fieldList as $field => $items) + { + if($field === 'branch') + { + if($this->session->currentProductType === 'branch') $this->config->$module->datatable->fieldList[$field]['title'] = $this->lang->datatable->branch; + if($this->session->currentProductType === 'platform') $this->config->$module->datatable->fieldList[$field]['title'] = $this->lang->datatable->platform; + continue; + } + $title = zget($this->lang->$module, $items['title'], zget($this->lang, $items['title'], $items['title'])); + $this->config->$module->datatable->fieldList[$field]['title'] = $title; + } + + if($this->config->edition != 'open') + { + $fields = $this->loadModel('workflowfield')->getList($module); + foreach($fields as $field) + { + if($field->buildin) continue; + $this->config->$module->datatable->fieldList[$field->field]['title'] = $field->name; + $this->config->$module->datatable->fieldList[$field->field]['width'] = '120'; + $this->config->$module->datatable->fieldList[$field->field]['fixed'] = 'no'; + $this->config->$module->datatable->fieldList[$field->field]['required'] = 'no'; + } + } + + return $this->config->$module->datatable->fieldList; + } + + /** + * Get save setting field. + * + * @param string $module + * @access public + * @return object + */ + public function getOldSetting(string $module) + { + $method = $this->app->getMethodName(); + $datatableId = $module . ucfirst($method); + + $mode = isset($this->config->datatable->$datatableId->mode) ? $this->config->datatable->$datatableId->mode : 'table'; + $key = $mode == 'datatable' ? 'cols' : 'tablecols'; + + $module = zget($this->config->datatable->moduleAlias, "$module-$method", $module); + if(!isset($this->config->$module)) $this->loadModel($module); + if(isset($this->config->datatable->$datatableId->$key)) $setting = json_decode($this->config->datatable->$datatableId->$key); + + $fieldList = $this->getOldFieldList($module); + if(empty($setting)) + { + $setting = $this->config->$module->datatable->defaultField; + $order = 1; + foreach($setting as $key => $value) + { + $id = $value; + $set = new stdclass();; + $set->order = $order++; + $set->id = $id; + $set->show = true; + $set->width = $fieldList[$id]['width']; + $set->fixed = $fieldList[$id]['fixed']; + $set->title = $fieldList[$id]['title']; + $set->sort = isset($fieldList[$id]['sort']) ? $fieldList[$id]['sort'] : 'yes'; + $set->name = isset($fieldList[$id]['name']) ? $fieldList[$id]['name'] : ''; + + if(isset($fieldList[$id]['minWidth'])) $set->minWidth = $fieldList[$id]['minWidth']; + if(isset($fieldList[$id]['maxWidth'])) $set->maxWidth = $fieldList[$id]['maxWidth']; + if(isset($fieldList[$id]['pri'])) $set->pri = $fieldList[$id]['pri']; + + $setting[$key] = $set; + } + } + else + { + foreach($setting as $key => $set) + { + if(!isset($fieldList[$set->id])) + { + unset($setting[$key]); + continue; + } + if($this->session->currentProductType === 'normal' and $set->id === 'branch') + { + unset($setting[$key]); + continue; + } + + if($set->id == 'actions') $set->width = $fieldList[$set->id]['width']; + $set->title = $fieldList[$set->id]['title']; + $set->sort = isset($fieldList[$set->id]['sort']) ? $fieldList[$set->id]['sort'] : 'yes'; + } + } + + usort($setting, array('datatableModel', 'sortOldCols')); + + return $setting; + } + /** * 获取期望的配置项。 * Format fields by config. @@ -202,6 +317,21 @@ class datatableModel extends model return $a['order'] - $b['order']; } + /** + * Sort old cols. + * + * @param object $a + * @param object $b + * @static + * @access public + * @return int + */ + public static function sortOldCols(object $a, object $b) + { + if(!isset($a->order)) return 0; + return $a->order - $b->order; + } + /** * 打印表格标题。 * Print table head. @@ -259,4 +389,36 @@ class datatableModel extends model echo ''; } } + + /** + * Set fixed field width + * + * @param array $setting + * @param int $minLeftWidth + * @param int $minRightWidth + * @access public + * @return array + */ + public function setFixedFieldWidth(array $setting, int $minLeftWidth = 550, int $minRightWidth = 140) + { + $widths['leftWidth'] = 30; + $widths['rightWidth'] = 0; + $hasLeftAuto = false; + $hasRightAuto = false; + foreach($setting as $key => $value) + { + if($value->fixed != 'no') + { + if($value->fixed == 'left' and $value->width == 'auto') $hasLeftAuto = true; + if($value->fixed == 'right' and $value->width == 'auto') $hasRightAuto = true; + $widthKey = $value->fixed . 'Width'; + if(!isset($widths[$widthKey])) $widths[$widthKey] = 0; + $widths[$widthKey] += (int)trim($value->width, 'px'); + } + } + if($widths['leftWidth'] <= 550 and $hasLeftAuto) $widths['leftWidth'] = 550; + if($widths['rightWidth'] <= 0 and $hasRightAuto) $widths['rightWidth'] = 140; + + return $widths; + } } diff --git a/module/datatable/view/ajaxoldcustom.html.php b/module/datatable/view/ajaxoldcustom.html.php new file mode 100644 index 0000000000..71a5e4726e --- /dev/null +++ b/module/datatable/view/ajaxoldcustom.html.php @@ -0,0 +1,215 @@ + + * @package datatable + * @version $Id$ + * @link https://www.zentao.net + */ +?> + + +datatable->reset); +js::set('resetGlobalText', $lang->datatable->resetGlobal); +?> + diff --git a/module/index/config.php b/module/index/config.php index 36cbbb1ade..acd48f83f0 100644 --- a/module/index/config.php +++ b/module/index/config.php @@ -34,3 +34,4 @@ $config->index->oldPages[] = 'ai-prompts'; $config->index->oldPages[] = 'ai-promptview'; $config->index->oldPages[] = 'api-debug'; $config->index->oldPages[] = 'misc-downloadclient'; +$config->index->oldPages[] = 'datatable-ajaxoldcustom';
    datatable->showModule;?>