diff --git a/CHANGELOG b/CHANGELOG index 4ea36a781c..2fc7b778b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ devel ----- +* ui: graph vertex collections not restricted to 10 anymore + +* fixed docs for issue #2968 + * fixed issue #2835: UI detection of JWT token in case of server restart or upgrade * upgrade jemalloc version to 5.0.1 diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js index 378e6352de..541b861835 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js @@ -924,7 +924,7 @@ true, false, false, - 10, + null, collList.sort(sorter) ) ); @@ -938,7 +938,7 @@ true, false, false, - 10, + null, collList.sort(sorter) ) ); @@ -956,7 +956,7 @@ false, false, false, - 10, + null, collList.sort(sorter) ) ); @@ -1035,15 +1035,15 @@ tags: collList, showSearchBox: false, minimumResultsForSearch: -1, - width: '336px', - maximumSelectionSize: 10 + width: '336px' + // maximumSelectionSize: 10 }); $('#toCollections' + this.counter).select2({ tags: collList, showSearchBox: false, minimumResultsForSearch: -1, - width: '336px', - maximumSelectionSize: 10 + width: '336px' + // maximumSelectionSize: 10 }); window.modalView.undelegateEvents(); window.modalView.delegateEvents(this.events); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/modalView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/modalView.js index 1028482ffd..ce99684636 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/modalView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/modalView.js @@ -375,13 +375,19 @@ self.modalBindValidation(row); if (row.type === self.tables.SELECT2) { // handle select2 - $('#' + row.id).select2({ + + var options = { tags: row.tags || [], showSearchBox: false, minimumResultsForSearch: -1, - width: '336px', - maximumSelectionSize: row.maxEntrySize || 8 - }); + width: '336px' + }; + + if (row.maxEntrySize) { + options.maximumSelectionSize = row.maxEntrySize; + } + + $('#' + row.id).select2(options); } });