Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix priv with button display.

Browse Source
This commit is contained in:
qixinzhi
2024-03-27 08:43:56 +00:00
parent 4a6d45ae0d
commit 8ce4d280bb
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/model.php
+24 -16
View File
@@ -1017,25 +1017,30 @@ class metricModel extends model
'suffix' => array()
);
if($metric->stage == 'wait')
{
$this->config->metric->actionList['edit']['icon'] = 'edit';
$this->config->metric->actionList['edit']['text'] = $this->lang->edit;
$this->config->metric->actionList['edit']['hint'] = $this->lang->edit;
$this->config->metric->actionList['edit']['data-toggle'] = 'modal';
$this->config->metric->actionList['edit']['url'] = helper::createLink('metric', 'edit', "metricID={$metric->id}");
$stage = $metric->stage;
$menuList['suffix'][] = $this->config->metric->actionList['edit'];
if($metric->stage == 'wait' && !$this->isOldMetric($metric) && $metric->builtin === '0') $menuList['main'][] = $this->config->metric->actionList['implement'];
}
else
if($stage == 'wait' and common::haspriv('metric', 'edit'))
{
$menuList['main'][] = $this->config->metric->actionList['delist'];
$editAction = $this->config->metric->actionList['edit'];
$editAction['data-toggle'] = 'modal';
$editAction['url'] = helper::createLink('metric', 'edit', "metricID={$metric->id}");
$menuList['suffix']['edit'] = $editAction;
}
if(!$metric->builtin)
if($stage == 'wait' and common::haspriv('metric', 'implement') and !$this->isOldMetric($metric) and $metric->builtin === '0')
{
$menuList['suffix'][] = $this->config->metric->actionList['delete'];
$menuList['main']['implement'] = $this->config->metric->actionList['implement'];
}
if($stage != 'wait' and common::haspriv('metric', 'delist'))
{
$menuList['main']['delist'] = $this->config->metric->actionList['delist'];
}
if(!$metric->builtin and common::haspriv('metric', 'delete'))
{
$menuList['suffix']['delete'] = $this->config->metric->actionList['delete'];
}
return $menuList;
@@ -1314,7 +1319,7 @@ class metricModel extends model
* @access public
* @return array
*/
public function initActionBtn(array $metrics): array
public function initActionBtn(array $metrics, array $cols): array
{
foreach($metrics as $metric)
{
@@ -1330,7 +1335,10 @@ class metricModel extends model
}
}
return $metrics;
$hasAction = !empty($metrics) && !empty($metrics[0]->actions);
if(!$hasAction) unset($cols['actions']);
return array($cols, $metrics);
}
/**
module/metric/ui/browse.html.php
+2 -2
View File
@@ -76,12 +76,12 @@ sidebar
);
$tableData = initTableData($metrics, $this->config->metric->dtable->definition->fieldList, $this->loadModel('metric'));
$tableData = $this->metric->initActionBtn($tableData);
list($cols, $tableData) = $this->metric->initActionBtn($tableData, $this->config->metric->dtable->definition->fieldList);
dtable
(
setID('metricList'),
set::cols($this->config->metric->dtable->definition->fieldList),
set::cols($cols),
set::data($tableData),
set::onRenderCell(jsRaw('window.onRenderCell')),
set::footPager(usePager())