gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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 2023-10-31 16:17:47 +01:00
commit d7e780493f
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -287,6 +287,7 @@
- check if document version may be removed
- set max file size for indexing when updating a document
- nicer output on info page
- do not show filter for categories in database search if they don't exist
--------------------------------------------------------------------------------
Changes in version 5.1.32

38
views/bootstrap/class.Search.php
View File

@ -619,20 +619,22 @@ $(document).ready(function() {
$tmpcatids[] = $tmpcat->getID();
$options = array();
$allcategories = $dms->getDocumentCategories();
foreach($allcategories as $acategory) {
$options[] = array($acategory->getID(), $acategory->getName(), in_array($acategory->getId(), $tmpcatids));
if($allcategories) {
foreach($allcategories as $acategory) {
$options[] = array($acategory->getID(), $acategory->getName(), in_array($acategory->getId(), $tmpcatids));
}
$this->formField(
getMLText("categories"),
array(
'element'=>'select',
'class'=>'chzn-select',
'name'=>'category[]',
'multiple'=>true,
'attributes'=>array(array('data-placeholder', getMLText('select_category'), array('data-no_results_text', getMLText('unknown_document_category')))),
'options'=>$options
)
);
}
$this->formField(
getMLText("categories"),
array(
'element'=>'select',
'class'=>'chzn-select',
'name'=>'category[]',
'multiple'=>true,
'attributes'=>array(array('data-placeholder', getMLText('select_category'), array('data-no_results_text', getMLText('unknown_document_category')))),
'options'=>$options
)
);
$options = array();
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if($workflowmode == 'traditional') {
@ -897,7 +899,7 @@ $(document).ready(function() {
foreach($values as $v=>$c) {
$uu = $dms->getUserByLogin($v);
if($uu) {
$option = array($uu->getId(), $v);
$option = array($uu->getId(), htmlspecialchars($v));
if(isset(${$facetname}) && in_array($uu->getId(), ${$facetname}))
$option[] = true;
else
@ -910,7 +912,7 @@ $(document).ready(function() {
foreach($values as $v=>$c) {
$cat = $dms->getDocumentCategoryByName($v);
if($cat) {
$option = array($cat->getId(), $v);
$option = array($cat->getId(), htmlspecialchars($v));
if(isset(${$facetname}) && in_array($cat->getId(), ${$facetname}))
$option[] = true;
else
@ -933,7 +935,7 @@ $(document).ready(function() {
/* Do not even create a list of options, because it isn't used */
} else {
foreach($values as $v=>$c) {
$option = array($v, $v);
$option = array($v, htmlspecialchars($v));
if(isset(${$facetname}) && in_array($v, ${$facetname}))
$option[] = true;
else
@ -1141,7 +1143,7 @@ $(document).ready(function() {
else
$fu = $dms->getUserByLogin($v);
if($fu)
$oldtransval[] = $fu->getLogin();
$oldtransval[] = htmlspecialchars($fu->getLogin());
}
break;
case 'status':
@ -1309,7 +1311,7 @@ $(document).ready(function() {
case 'owner':
foreach($values as $v=>$c) {
if($fu = $dms->getUserByLogin($v))
$menuitems[] = array('label'=>$fu->getLogin(), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.$fu->getId(), 'badge'=>$c);
$menuitems[] = array('label'=>htmlspecialchars($fu->getLogin()), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.$fu->getId(), 'badge'=>$c);
}
break;
default: