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

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-09-26 17:48:18 +02:00
commit dd5bc7d10e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -48,6 +48,6 @@ doc:
$(PHPDOC) -d SeedDMS_Core --ignore 'getusers.php,getfoldertree.php,config.php,reverselookup.php' --force -t html $(PHPDOC) -d SeedDMS_Core --ignore 'getusers.php,getfoldertree.php,config.php,reverselookup.php' --force -t html
apidoc: apidoc:
apigen generate -s SeedDMS_Core --exclude tests --skip-doc-prefix tests -d html apigen generate -s SeedDMS_Core --exclude tests -d html
.PHONY: webdav webapp .PHONY: webdav webapp

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

@ -143,7 +143,7 @@ $(document).ready(function() {
?> ?>
<table class="table-condensed"> <table class="table-condensed">
<?php <?php
if(!$workflow->isUsed()) { if($workflow && !$workflow->isUsed()) {
?> ?>
<tr><td></td><td><a class="standardText btn" href="../out/out.RemoveWorkflow.php?workflowid=<?php print $workflow->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_workflow");?></a></td></tr> <tr><td></td><td><a class="standardText btn" href="../out/out.RemoveWorkflow.php?workflowid=<?php print $workflow->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_workflow");?></a></td></tr>
<?php <?php
@ -288,7 +288,6 @@ $(document).ready(function() {
function form() { /* {{{ */ function form() { /* {{{ */
$selworkflow = $this->params['selworkflow']; $selworkflow = $this->params['selworkflow'];
if($selworkflow)
$this->showWorkflowForm($selworkflow); $this->showWorkflowForm($selworkflow);
} /* }}} */ } /* }}} */