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

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

Browse Source
This commit is contained in:
Uwe Steinmann 2017-07-21 16:56:33 +02:00
commit ee13f8d084
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -38,6 +38,8 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.3 Changes in version 5.1.3
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- add link to search for attribute value in attribute mgr
- fix output of validation errors in attribute mgr
- check if user has access on document and is not disabled if set as - check if user has access on document and is not disabled if set as
reviewer, approver reviewer, approver
- merged changes from 5.0.13 - merged changes from 5.0.13

4
inc/inc.Language.php
View File

@ -329,7 +329,7 @@ function getOverallStatusText($status) { /* {{{ */
} }
} /* }}} */ } /* }}} */
function getAttributeValidationText($error, $attrname='', $attrvalue='') { /* {{{ */ function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
switch($error) { switch($error) {
case 10: case 10:
return getMLText("attr_not_in_valueset", array('attrname'=>$attrname, 'value'=>$attrvalue)); return getMLText("attr_not_in_valueset", array('attrname'=>$attrname, 'value'=>$attrvalue));
@ -353,7 +353,7 @@ function getAttributeValidationText($error, $attrname='', $attrvalue='') { /* {{
return getMLText("attr_malformed_url", array('attrname'=>$attrname, 'value'=>$attrvalue)); return getMLText("attr_malformed_url", array('attrname'=>$attrname, 'value'=>$attrvalue));
break; break;
case 3: case 3:
return getMLText("attr_no_regex_match", array('attrname'=>$attrname, 'value'=>$attrvalue)); return getMLText("attr_no_regex_match", array('attrname'=>$attrname, 'value'=>$attrvalue, 'regex'=>$regex));
break; break;
case 2: case 2:
return getMLText("attr_max_values", array('attrname'=>$attrname, 'value'=>$attrvalue)); return getMLText("attr_max_values", array('attrname'=>$attrname, 'value'=>$attrvalue));

7
views/bootstrap/class.AttributeMgr.php
View File

@ -82,12 +82,13 @@ $(document).ready( function() {
foreach($res['frequencies'][$type] as $entry) { foreach($res['frequencies'][$type] as $entry) {
$value = $selattrdef->parseValue($entry['value']); $value = $selattrdef->parseValue($entry['value']);
$content .= "<tr>"; $content .= "<tr>";
$content .= "<td>".implode(';', $value)."</td><td>".$entry['c']."</td>"; $content .= "<td>".implode(';', $value)."</td>";
$content .= "<td><a href=\"../out/out.Search.php?resultmode=".($type == 'folder' ? 2 : ($type == 'document' ? 1 : 3))."&attributes[".$selattrdef->getID()."]=".$entry['value']."\">".urlencode($entry['c'])."</a></td>";
$content .= "<td>";
/* various checks, if the value is valid */ /* various checks, if the value is valid */
if(!$selattrdef->validate($entry['value'])) { if(!$selattrdef->validate($entry['value'])) {
$content .= getAttributeValidationText($selattrdef->getValidationError(), $selattrdef->getName(), $entry['value']); $content .= getAttributeValidationText($selattrdef->getValidationError(), $selattrdef->getName(), $entry['value'], $selattrdef->getRegex());
} }
$content .= "<td>";
/* Check if value is in value set */ /* Check if value is in value set */
if($selattrdef->getValueSet()) { if($selattrdef->getValueSet()) {
foreach($value as $v) { foreach($value as $v) {