mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-11 17:44:56 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
cd263e7353
|
@ -67,7 +67,6 @@ $(document).ready( function() {
|
|||
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
|
||||
$this->contentHeading(getMLText("set_workflow"));
|
||||
|
||||
$this->contentContainerStart();
|
||||
// Display the Workflow form.
|
||||
$this->rowStart();
|
||||
$this->columnStart(4);
|
||||
|
@ -81,6 +80,7 @@ $(document).ready( function() {
|
|||
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
|
||||
|
||||
<?php
|
||||
$this->contentContainerStart();
|
||||
$mandatoryworkflow = $user->getMandatoryWorkflow();
|
||||
$workflows=$dms->getAllWorkflows();
|
||||
$options = array();
|
||||
|
@ -97,6 +97,7 @@ $(document).ready( function() {
|
|||
'options'=>$options
|
||||
)
|
||||
);
|
||||
$this->contentContainerEnd();
|
||||
$this->formSubmit(getMLText('set_workflow'));
|
||||
?>
|
||||
|
||||
|
@ -116,7 +117,6 @@ $(document).ready( function() {
|
|||
<?php
|
||||
$this->columnEnd();
|
||||
$this->rowEnd();
|
||||
$this->contentContainerEnd();
|
||||
$this->contentEnd();
|
||||
$this->htmlEndPage();
|
||||
} /* }}} */
|
||||
|
|
Loading…
Reference in New Issue
Block a user