gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

various corrections

Browse Source
This commit is contained in:
Uwe Steinmann 2018-06-26 07:02:12 +02:00
parent 613bf9387c
commit 6b7994363e
1 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
views/bootstrap/class.AddDocument.php
View File

@ -228,12 +228,12 @@ $(document).ready(function() {
) )
); );
$this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : '')); $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
if($presetexpiration) { if($presetexpiration) {
if(!($expts = strtotime($presetexpiration))) if(!($expts = strtotime($presetexpiration)))
$expts = false;
} else {
$expts = false; $expts = false;
} } else {
$expts = false;
}
$options = array(); $options = array();
$options[] = array('never', getMLText('does_not_expire')); $options[] = array('never', getMLText('does_not_expire'));
$options[] = array('date', getMLText('expire_by_date'), $expts); $options[] = array('date', getMLText('expire_by_date'), $expts);
@ -351,52 +351,50 @@ $(document).ready(function() {
} }
if($workflowmode == 'advanced') { if($workflowmode == 'advanced') {
?> $mandatoryworkflows = $user->getMandatoryWorkflows();
<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div> if($mandatoryworkflows) {
<?php if(count($mandatoryworkflows) == 1) {
$mandatoryworkflows = $user->getMandatoryWorkflows(); $this->formField(
if($mandatoryworkflows) { getMLText("workflow"),
if(count($mandatoryworkflows) == 1) { htmlspecialchars($mandatoryworkflows[0]->getName()).'<input type="hidden" name="workflow" value="'.$mandatoryworkflows[0]->getID().'">'
$this->formField( );
getMLText("workflow"),
htmlspecialchars($mandatoryworkflows[0]->getName()).'<input type="hidden" name="workflow" value="'.$mandatoryworkflows[0]->getID().'">'
);
} else {
$options = array();
foreach ($mandatoryworkflows as $workflow) {
$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()));
}
$this->formField(
getMLText("owner"),
array(
'element'=>'select',
'id'=>'workflow',
'name'=>'workflow',
'class'=>'chzn-select',
'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_workflow'))),
'options'=>$options
)
);
}
} else { } else {
$options = array(); $options = array();
$workflows=$dms->getAllWorkflows(); foreach ($mandatoryworkflows as $workflow) {
foreach ($workflows as $workflow) {
$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName())); $options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()));
} }
$this->formField( $this->formField(
getMLText("owner"), getMLText("workflow"),
array( array(
'element'=>'select', 'element'=>'select',
'id'=>'workflow', 'id'=>'workflow',
'name'=>'workflow', 'name'=>'workflow',
'class'=>'chzn-select', 'class'=>'chzn-select',
'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_workflow'))), 'attributes'=>array(array('data-placeholder', getMLText('select_workflow'))),
'options'=>$options 'options'=>$options
) )
); );
} }
$this->warningMsg(getMLText("add_doc_workflow_warning")); } else {
$options = array();
$options[] = array('', '');
$workflows=$dms->getAllWorkflows();
foreach ($workflows as $workflow) {
$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()));
}
$this->formField(
getMLText("workflow"),
array(
'element'=>'select',
'id'=>'workflow',
'name'=>'workflow',
'class'=>'chzn-select',
'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_workflow'))),
'options'=>$options
)
);
}
$this->warningMsg(getMLText("add_doc_workflow_warning"));
} else { } else {
if($workflowmode == 'traditional') { if($workflowmode == 'traditional') {
$this->contentSubHeading(getMLText("assign_reviewers")); $this->contentSubHeading(getMLText("assign_reviewers"));