Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

graph vertex collections not restricted to 10 anymore (#2987)

This commit is contained in:
Heiko 2017-08-10 22:13:45 +02:00 committed by Frank Celler
parent e06c85886e
commit 286db19df2
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,6 +1,10 @@
devel 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 * fixed issue #2835: UI detection of JWT token in case of server restart or upgrade
* upgrade jemalloc version to 5.0.1 * upgrade jemalloc version to 5.0.1

14
js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
View File

@ -924,7 +924,7 @@
true, true,
false, false,
false, false,
10, null,
collList.sort(sorter) collList.sort(sorter)
) )
); );
@ -938,7 +938,7 @@
true, true,
false, false,
false, false,
10, null,
collList.sort(sorter) collList.sort(sorter)
) )
); );
@ -956,7 +956,7 @@
false, false,
false, false,
false, false,
10, null,
collList.sort(sorter) collList.sort(sorter)
) )
); );
@ -1035,15 +1035,15 @@
tags: collList, tags: collList,
showSearchBox: false, showSearchBox: false,
minimumResultsForSearch: -1, minimumResultsForSearch: -1,
width: '336px', width: '336px'
maximumSelectionSize: 10 // maximumSelectionSize: 10
}); });
$('#toCollections' + this.counter).select2({ $('#toCollections' + this.counter).select2({
tags: collList, tags: collList,
showSearchBox: false, showSearchBox: false,
minimumResultsForSearch: -1, minimumResultsForSearch: -1,
width: '336px', width: '336px'
maximumSelectionSize: 10 // maximumSelectionSize: 10
}); });
window.modalView.undelegateEvents(); window.modalView.undelegateEvents();
window.modalView.delegateEvents(this.events); window.modalView.delegateEvents(this.events);

14
js/apps/system/_admin/aardvark/APP/frontend/js/views/modalView.js
View File

@ -375,13 +375,19 @@
self.modalBindValidation(row); self.modalBindValidation(row);
if (row.type === self.tables.SELECT2) { if (row.type === self.tables.SELECT2) {
// handle select2 // handle select2
$('#' + row.id).select2({
var options = {
tags: row.tags || [], tags: row.tags || [],
showSearchBox: false, showSearchBox: false,
minimumResultsForSearch: -1, minimumResultsForSearch: -1,
width: '336px', width: '336px'
maximumSelectionSize: row.maxEntrySize || 8 };
});
if (row.maxEntrySize) {
options.maximumSelectionSize = row.maxEntrySize;
}
$('#' + row.id).select2(options);
} }
}); });