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

* Add codes to print labels set by workflow.

Browse Source
This commit is contained in:
liugang
2019-07-12 17:37:46 +08:00
parent 8a313c4ef4
commit 549b0a85b0
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+25 -9
View File
@@ -273,19 +273,35 @@ class router extends baseRouter
$flow = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOW . " WHERE `module` = '$this->moduleName'")->fetch();
if($flow)
{
$action = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOWACTION . " WHERE `module` = '$this->moduleName' AND `action` = '$this->methodName'")->fetch();
if(zget($action, 'extensionType') == 'override')
if($flow->buildin && $this->methodName == 'browselabel')
{
$this->workflowModule = $this->moduleName;
$this->workflowMethod = $this->methodName;
$this->workflowModule = $this->moduleName;
$this->workflowMethod = 'browse';
$this->loadModuleConfig('workflowaction');
$this->loadModuleConfig('workflowaction');
$moduleName = 'flow';
$methodName = in_array($this->methodName, $this->config->workflowaction->default->actions) ? $this->methodName : 'operate';
$moduleName = 'flow';
$methodName = 'browse';
$this->setModuleName($moduleName);
$this->setMethodName($methodName);
$this->setModuleName($moduleName);
$this->setMethodName($methodName);
}
else
{
$action = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOWACTION . " WHERE `module` = '$this->moduleName' AND `action` = '$this->methodName'")->fetch();
if(zget($action, 'extensionType') == 'override')
{
$this->workflowModule = $this->moduleName;
$this->workflowMethod = $this->methodName;
$this->loadModuleConfig('workflowaction');
$moduleName = 'flow';
$methodName = in_array($this->methodName, $this->config->workflowaction->default->actions) ? $this->methodName : 'operate';
$this->setModuleName($moduleName);
$this->setMethodName($methodName);
}
}
}
}
module/product/view/all.html.php
+8 -1
View File
@@ -22,10 +22,17 @@
<?php
foreach($lang->product->featureBar['all'] as $key => $label)
{
if(is_string($label)) $link = inlink("all", "productID={$productID}&line=&status={$key}");
if(is_array($label))
{
$link = zget($label, 'link', '');
$label = zget($label, 'label', '');
if(!$link or !$label) continue;
}
$label = "<span class='text'>{$label}</span>";
$label .= $key == $status ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$active = $key == $status ? 'btn-active-text' : '';
echo html::a(inlink("all", "productID={$productID}&line=&status={$key}"), $label, '', "class='btn btn-link {$active}' id='{$key}'");
echo html::a($link, $label, '', "class='btn btn-link {$active}' id='{$key}'");
}
?>
</div>