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

This commit is contained in:
Uwe Steinmann 2021-07-12 19:50:07 +02:00
commit 441f477de6
2 changed files with 30 additions and 10 deletions

View File

@ -83,6 +83,21 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
} }
} /* }}} */ } /* }}} */
/**
* Output a single attribute in the document info section
*
* @param object $attribute attribute
*/
protected function printAttribute($attribute) { /* {{{ */
$attrdef = $attribute->getAttributeDefinition();
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<td><?php echo $this->getAttributeValue($attribute); ?></td>
</tr>
<?php
} /* }}} */
protected function printVersionAttributes($folder, $version) { /* {{{ */ protected function printVersionAttributes($folder, $version) { /* {{{ */
$f = null; $f = null;
$attrdefgrps = $folder->getAttributeDefintionGroupList(true, $f); $attrdefgrps = $folder->getAttributeDefintionGroupList(true, $f);

View File

@ -98,6 +98,21 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Theme_Style {
} }
} /* }}} */ } /* }}} */
/**
* Output a single attribute in the document info section
*
* @param object $attribute attribute
*/
protected function printAttribute($attribute) { /* {{{ */
$attrdef = $attribute->getAttributeDefinition();
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<td><?php echo $this->getAttributeValue($attribute); ?></td>
</tr>
<?php
} /* }}} */
public function subtree() { /* {{{ */ public function subtree() { /* {{{ */
$user = $this->params['user']; $user = $this->params['user'];
$node = $this->params['node']; $node = $this->params['node'];
@ -236,16 +251,6 @@ $('body').on('click', '.order-btn', function(ev) {
$this->printDeleteDocumentButtonJs(); $this->printDeleteDocumentButtonJs();
} /* }}} */ } /* }}} */
protected function printAttribute($attribute) { /* {{{ */
$attrdef = $attribute->getAttributeDefinition();
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<td><?php echo $this->getAttributeValue($attribute); ?></td>
</tr>
<?php
} /* }}} */
function folderInfos() { /* {{{ */ function folderInfos() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];