mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-06 15:14:58 +00:00
fix adding workflow log
This commit is contained in:
parent
50b25a59ec
commit
7f16340a26
|
@ -203,7 +203,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
if($attributes = $folder->getAttributes()) {
|
if($attributes = $folder->getAttributes()) {
|
||||||
foreach($attributes as $attribute) {
|
foreach($attributes as $attribute) {
|
||||||
$attrdef = $attribute->getAttributeDefinition();
|
$attrdef = $attribute->getAttributeDefinition();
|
||||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
|
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValueAsString())."</attr>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$notifications = $folder->getNotifyList();
|
$notifications = $folder->getNotifyList();
|
||||||
|
@ -278,7 +278,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
if($attributes = $document->getAttributes()) {
|
if($attributes = $document->getAttributes()) {
|
||||||
foreach($attributes as $attribute) {
|
foreach($attributes as $attribute) {
|
||||||
$attrdef = $attribute->getAttributeDefinition();
|
$attrdef = $attribute->getAttributeDefinition();
|
||||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
|
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValueAsString())."</attr>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -335,7 +335,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
if($attributes = $version->getAttributes()) {
|
if($attributes = $version->getAttributes()) {
|
||||||
foreach($attributes as $attribute) {
|
foreach($attributes as $attribute) {
|
||||||
$attrdef = $attribute->getAttributeDefinition();
|
$attrdef = $attribute->getAttributeDefinition();
|
||||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
|
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValueAsString())."</attr>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($statuslog = $version->getStatusLog()) {
|
if($statuslog = $version->getStatusLog()) {
|
||||||
|
@ -371,9 +371,13 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
$workflowstate = $version->getWorkflowState();
|
$workflowstate = $version->getWorkflowState();
|
||||||
echo $indent." <workflow id=\"".$workflow->getID()."\" state=\"".$workflowstate->getID()."\"></workflow>\n";
|
echo $indent." <workflow id=\"".$workflow->getID()."\" state=\"".$workflowstate->getID()."\"></workflow>\n";
|
||||||
}
|
}
|
||||||
$wkflogs = $version->getWorkflowLog();
|
if($workflow)
|
||||||
if($wkflogs) {
|
$wkfalllogs[$workflow->getId()] = $version->getWorkflowLog();
|
||||||
|
else
|
||||||
|
$wkfalllogs = $version->getWorkflowLog();
|
||||||
|
if($wkfalllogs) {
|
||||||
echo $indent." <workflowlogs>\n";
|
echo $indent." <workflowlogs>\n";
|
||||||
|
foreach($wkfalllogs as $wkflogs) {
|
||||||
foreach($wkflogs as $wklog) {
|
foreach($wkflogs as $wklog) {
|
||||||
echo $indent." <workflowlog>\n";
|
echo $indent." <workflowlog>\n";
|
||||||
echo $indent." <attr name=\"date\" format=\"Y-m-d H:i:s\">".$wklog->getDate()."</attr>\n";
|
echo $indent." <attr name=\"date\" format=\"Y-m-d H:i:s\">".$wklog->getDate()."</attr>\n";
|
||||||
|
@ -384,6 +388,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
echo $indent." <attr name=\"comment\">".wrapWithCData($wklog->getComment())."</attr>\n";
|
echo $indent." <attr name=\"comment\">".wrapWithCData($wklog->getComment())."</attr>\n";
|
||||||
echo $indent." </workflowlog>\n";
|
echo $indent." </workflowlog>\n";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
echo $indent." </workflowlogs>\n";
|
echo $indent." </workflowlogs>\n";
|
||||||
}
|
}
|
||||||
if(file_exists($dms->contentDir . $version->getPath())) {
|
if(file_exists($dms->contentDir . $version->getPath())) {
|
||||||
|
@ -470,11 +475,11 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
include($myincpath."/inc/inc.Settings.php");
|
include($myincpath."/inc/inc.Settings.php");
|
||||||
|
include($myincpath."/inc/inc.Utils.php");
|
||||||
include($myincpath."/inc/inc.Init.php");
|
include($myincpath."/inc/inc.Init.php");
|
||||||
include($myincpath."/inc/inc.Extension.php");
|
include($myincpath."/inc/inc.Extension.php");
|
||||||
include($myincpath."/inc/inc.DBInit.php");
|
include($myincpath."/inc/inc.DBInit.php");
|
||||||
include($myincpath."/inc/inc.ClassSettings.php");
|
include($myincpath."/inc/inc.ClassAcl.php");
|
||||||
include($myincpath."/inc/inc.Acl.php");
|
|
||||||
|
|
||||||
if(!$folderid) {
|
if(!$folderid) {
|
||||||
$folderid = $settings->_rootFolderID;
|
$folderid = $settings->_rootFolderID;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user