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

various rebase fixes

Browse Source
This commit is contained in:
Uwe Steinmann 2026-04-21 12:30:44 +02:00
parent 1e78d54b2c
commit e432dddfce
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/bootstrap/class.ViewDocument.php
View File

@ -2048,8 +2048,8 @@ $(document).ready( function() {
<input type="hidden" name="documentid" value="<?php print $documentid;?>">
<?php echo createHiddenFieldWithKey('adddocumentlink'); ?>
<?php $this->contentContainerStart(); ?>
<?php $this->formField(getMLText("linked_document"), $this->getDocumentChooserHtml("form1")); ?>
<?php
<?php $this->formField(getMLText("add_document_link"), $this->getDocumentChooserHtml("form1")); ?>
<?php
$options = [];
foreach($dms->getLinkTypes() as $linktype) {
$options[] = array($linktype->getID(), htmlspecialchars($linktype->getName()), false, array(/*array('data-subtitle', $linktype->countDocumentLinksByType().' '.getMLText('documents'))*/));

32
views/bootstrap4/class.Bootstrap4.php
View File

@ -1018,6 +1018,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['definitions']['children']['document_linktypes'] = array('link'=>$this->params['settings']->_httpRoot."out/out.LinkTypes.php", 'label'=>getMLText('global_link_types'));
if ($accessobject->check_view_access('AttributeMgr'))
$menuitems['definitions']['children']['attribute_definitions'] = array('link'=>$this->params['settings']->_httpRoot."out/out.AttributeMgr.php", 'label'=>getMLText('global_attributedefinitions'));
if ($accessobject->check_view_access('AttributeGroupMgr'))
$menuitems['definitions']['children']['attributegroup_definitions'] = array('link'=>$this->params['settings']->_httpRoot."out/out.AttributeGroupMgr.php", 'label'=>getMLText('global_attributedefinitiongroups'));
if($this->params['workflowmode'] == 'advanced') {
if ($accessobject->check_view_access('WorkflowMgr'))
$menuitems['definitions']['children']['workflows'] = array('link'=>$this->params['settings']->_httpRoot."out/out.WorkflowMgr.php", 'label'=>getMLText('global_workflows'));
@ -2044,11 +2046,11 @@ $(document).ready(function() {
*
* @param object $attribute attribute
*/
protected function printAttributeValue($attribute) { /* {{{ */
echo self::getAttributeValue($attribute);
protected function printAttributeValue($attribute, $noecho=false) { /* {{{ */
echo self::getAttributeValue($attribute, $noecho);
} /* }}} */
function getAttributeValue($attribute) { /* {{{ */
function getAttributeValue($attribute, $noecho=false) { /* {{{ */
$dms = $this->params['dms'];
$attrdef = $attribute->getAttributeDefinition();
switch($attrdef->getType()) {
@ -2058,7 +2060,7 @@ $(document).ready(function() {
foreach($attrs as $attr) {
$tmp[] = '<a href="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
}
return implode('<br />', $tmp);
$content = implode('<br />', $tmp);
break;
case SeedDMS_Core_AttributeDefinition::type_email:
$attrs = $attribute->getValueAsArray();
@ -2066,7 +2068,7 @@ $(document).ready(function() {
foreach($attrs as $attr) {
$tmp[] = '<a mailto="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
}
return implode('<br />', $tmp);
$content = implode('<br />', $tmp);
break;
case SeedDMS_Core_AttributeDefinition::type_folder:
$attrs = $attribute->getValueAsArray();
@ -2075,7 +2077,7 @@ $(document).ready(function() {
if ($targetfolder)
$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$targetfolder->getId().'">'.htmlspecialchars($targetfolder->getName()).'</a>';
}
return implode('<br />', $tmp);
$content = implode('<br />', $tmp);
break;
case SeedDMS_Core_AttributeDefinition::type_document:
$attrs = $attribute->getValueAsArray();
@ -2084,7 +2086,7 @@ $(document).ready(function() {
if ($targetdoc)
$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$targetdoc->getId().'">'.htmlspecialchars($targetdoc->getName()).'</a>';
}
return implode('<br />', $tmp);
$content = implode('<br />', $tmp);
break;
case SeedDMS_Core_AttributeDefinition::type_user:
$attrs = $attribute->getValueAsArray();
@ -2093,7 +2095,7 @@ $(document).ready(function() {
if ($curuser)
$tmp[] = htmlspecialchars($curuser->getFullname()." (".$curuser->getLogin().")");
}
return implode('<br />', $tmp);
$content = implode('<br />', $tmp);
break;
case SeedDMS_Core_AttributeDefinition::type_group:
$attrs = $attribute->getValueAsArray();
@ -2102,7 +2104,7 @@ $(document).ready(function() {
if ($curgroup)
$tmp[] = htmlspecialchars($curgroup->getName());
}
return implode('<br />', $tmp);
$content = implode('<br />', $tmp);
break;
case SeedDMS_Core_AttributeDefinition::type_date:
$attrs = $attribute->getValueAsArray();
@ -2110,11 +2112,15 @@ $(document).ready(function() {
foreach($attrs as $attr) {
$tmp[] = getReadableDate($attr);
}
return implode(', ', $tmp);
$content = implode(', ', $tmp);
break;
default:
return htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
$content = htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
}
if($noecho)
return $content;
else
echo $content;
} /* }}} */
function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false, $namepostfix='', $alwaysmultiple=false) { /* {{{ */
@ -3573,7 +3579,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
*
* @param object $document
* @param object $previewer
* @param boolean $skipcont set to true if embrasing tr shall be skipped
* @param boolean $skipcont set to true if embrasing tr shall be skipped.
* In that case call documentListRowStart() before and documentListRowEnd()
* after this method.
* @param integer $version set to a value != 0 for a specific version, otherwise
@ -3697,7 +3703,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= "<br />";
foreach($categories as $category) {
$color = $category->getColor() ? $category->getColor() : substr(md5($category->getName()), 0, 6);
$content .= "<span class=\"badge\" style=\"background-color: #".$color."; color: #".self::getContrastColor($color).";\">".$category->getName()."</span> ";
$content .= "<span class=\"badge\" style=\"background-color: #".$color."; color: #".self::getContrastColor($color).";\">".htmlspecialchars($category->getName())."</span> ";
}
}
if(!empty($extracontent['bottom_title']))