gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2023-10-15 17:31:43 +02:00
commit 000f1e2c44
5 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassSettings.php
View File

@ -185,7 +185,7 @@ class Settings { /* {{{ */
// enable/disable listing logged in user as reviewer/approver // enable/disable listing logged in user as reviewer/approver
var $_enableSelfRevApp = false; var $_enableSelfRevApp = false;
// enable/disable hidden user as reviewer/approver // enable/disable hidden user as reviewer/approver
var $_enableHiddenRevApp = false; var $_enableHiddenRevApp = true;
// enable/disable update of a review/approval by the reviewer/approver // enable/disable update of a review/approval by the reviewer/approver
var $_enableUpdateRevApp = false; var $_enableUpdateRevApp = false;
// enable/disable removal of a review/approval by the admiistrator // enable/disable removal of a review/approval by the admiistrator
@ -797,6 +797,7 @@ class Settings { /* {{{ */
$this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]); $this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]);
$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]); $this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]); $this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
$this->_enableHiddenRevApp = Settings::boolval($tab["enableHiddenRevApp"]);
$this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]); $this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]);
$this->_enableRemoveRevApp = Settings::boolval($tab["enableRemoveRevApp"]); $this->_enableRemoveRevApp = Settings::boolval($tab["enableRemoveRevApp"]);
$this->_enableSelfReceipt = Settings::boolval($tab["enableSelfReceipt"]); $this->_enableSelfReceipt = Settings::boolval($tab["enableSelfReceipt"]);
@ -1166,6 +1167,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp); $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp);
$this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp); $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
$this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp); $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
$this->setXMLAttributValue($node, "enableHiddenRevApp", $this->_enableHiddenRevApp);
$this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp); $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp);
$this->setXMLAttributValue($node, "enableRemoveRevApp", $this->_enableRemoveRevApp); $this->setXMLAttributValue($node, "enableRemoveRevApp", $this->_enableRemoveRevApp);
$this->setXMLAttributValue($node, "enableSelfReceipt", $this->_enableSelfReceipt); $this->setXMLAttributValue($node, "enableSelfReceipt", $this->_enableSelfReceipt);

1
out/out.WorkflowMgr.php
View File

@ -57,6 +57,7 @@ if($view) {
$view->setParam('selworkflow', $selworkflow); $view->setParam('selworkflow', $selworkflow);
$view->setParam('allworkflows', $workflows); $view->setParam('allworkflows', $workflows);
$view->setParam('allworkflowstates', $workflowstates); $view->setParam('allworkflowstates', $workflowstates);
$view->setParam('enablehiddenrevapp', $settings->_enableHiddenRevApp);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
exit; exit;

46
views/bootstrap/class.SetWorkflow.php
View File

@ -70,8 +70,8 @@ $(document).ready( function() {
// Display the Workflow form. // Display the Workflow form.
$this->rowStart(); $this->rowStart();
$this->columnStart(4); $this->columnStart(4);
$workflows = $dms->getAllWorkflows(); $workflows = $dms->getAllWorkflows();
if($workflows) { if($workflows) {
?> ?>
<form class="form-horizontal" action="../op/op.SetWorkflow.php" method="post" name="form1"> <form class="form-horizontal" action="../op/op.SetWorkflow.php" method="post" name="form1">
<?php echo createHiddenFieldWithKey('setworkflow'); ?> <?php echo createHiddenFieldWithKey('setworkflow'); ?>
@ -80,34 +80,34 @@ $(document).ready( function() {
<input type="hidden" name="showtree" value="<?php echo showtree();?>"> <input type="hidden" name="showtree" value="<?php echo showtree();?>">
<?php <?php
$this->contentContainerStart(); $this->contentContainerStart();
$mandatoryworkflow = $user->getMandatoryWorkflow(); $mandatoryworkflow = $user->getMandatoryWorkflow();
$workflows=$dms->getAllWorkflows(); $workflows=$dms->getAllWorkflows();
$options = array(); $options = array();
foreach ($workflows as $workflow) { foreach ($workflows as $workflow) {
$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()), $mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID()); $options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()), $mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID());
} }
$this->formField( $this->formField(
getMLText("workflow"), getMLText("workflow"),
array( array(
'element'=>'select', 'element'=>'select',
'id'=>'selector', 'id'=>'selector',
'name'=>'workflow', 'name'=>'workflow',
'data-placeholder'=>getMLText('select_workflow'), 'data-placeholder'=>getMLText('select_workflow'),
'options'=>$options 'options'=>$options
) )
); );
$this->contentContainerEnd(); $this->contentContainerEnd();
$this->formSubmit(getMLText('set_workflow')); $this->formSubmit(getMLText('set_workflow'));
?> ?>
</form> </form>
<?php <?php
} else { } else {
?> ?>
<p><?php printMLText('no_workflow_available'); ?></p> <p><?php printMLText('no_workflow_available'); ?></p>
<?php <?php
} }
$this->columnEnd(); $this->columnEnd();
$this->columnStart(8); $this->columnStart(8);
?> ?>

1
views/bootstrap/class.Settings.php
View File

@ -535,6 +535,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
<?php $this->showConfigCheckbox('settings_enableAdminRevApp', 'enableAdminRevApp'); ?> <?php $this->showConfigCheckbox('settings_enableAdminRevApp', 'enableAdminRevApp'); ?>
<?php $this->showConfigCheckbox('settings_enableOwnerRevApp', 'enableOwnerRevApp'); ?> <?php $this->showConfigCheckbox('settings_enableOwnerRevApp', 'enableOwnerRevApp'); ?>
<?php $this->showConfigCheckbox('settings_enableSelfRevApp', 'enableSelfRevApp'); ?> <?php $this->showConfigCheckbox('settings_enableSelfRevApp', 'enableSelfRevApp'); ?>
<?php $this->showConfigCheckbox('settings_enableHiddenRevApp', 'enableHiddenRevApp'); ?>
<?php $this->showConfigCheckbox('settings_enableUpdateRevApp', 'enableUpdateRevApp'); ?> <?php $this->showConfigCheckbox('settings_enableUpdateRevApp', 'enableUpdateRevApp'); ?>
<?php $this->showConfigCheckbox('settings_enableRemoveRevApp', 'enableRemoveRevApp'); ?> <?php $this->showConfigCheckbox('settings_enableRemoveRevApp', 'enableRemoveRevApp'); ?>
<?php $this->showConfigCheckbox('settings_enableSelfReceipt', 'enableSelfReceipt'); ?> <?php $this->showConfigCheckbox('settings_enableSelfReceipt', 'enableSelfReceipt'); ?>

2
views/bootstrap/class.WorkflowMgr.php
View File

@ -121,6 +121,7 @@ $(document).ready(function() {
$user = $this->params['user']; $user = $this->params['user'];
$workflows = $this->params['allworkflows']; $workflows = $this->params['allworkflows'];
$workflowstates = $this->params['allworkflowstates']; $workflowstates = $this->params['allworkflowstates'];
$enablehiddenrevapp = $this->params['enablehiddenrevapp'];
if($workflow) { if($workflow) {
$path = $workflow->checkForCycles(); $path = $workflow->checkForCycles();
@ -295,6 +296,7 @@ $(document).ready(function() {
echo "<select class=\"chzn-select\" name=\"users[]\" multiple=\"multiple\" data-placeholder=\"".getMLText('select_users')."\" data-no_results_text=\"".getMLText('unknown_user')."\">"; echo "<select class=\"chzn-select\" name=\"users[]\" multiple=\"multiple\" data-placeholder=\"".getMLText('select_users')."\" data-no_results_text=\"".getMLText('unknown_user')."\">";
$allusers = $dms->getAllUsers(); $allusers = $dms->getAllUsers();
foreach($allusers as $usr) { foreach($allusers as $usr) {
if(!$enablehiddenrevapp && $usr->isHidden()) continue;
print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>"; print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
} }
echo "</select>"; echo "</select>";