mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
This commit is contained in:
commit
a5ed1d8fab
|
@ -87,6 +87,8 @@ The following other AQL functions have been added:
|
|||
the counterpart to the already existing `ATTRIBUTES` function)
|
||||
- `ZIP(attributes, values)`: returns a document constructed from attributes
|
||||
and values passed in separate parameters
|
||||
- `PERCENTILE(values, n, method)`: returns the nths percentile of the
|
||||
values provided, using rank or interpolation method
|
||||
|
||||
The already existing functions `CONCAT` and `CONCAT_SEPARATOR` now support
|
||||
list arguments, e.g.:
|
||||
|
|
|
@ -550,7 +550,10 @@ helpers = helpers || Handlebars.helpers; data = data || {};
|
|||
if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
|
||||
else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
|
||||
buffer += escapeExpression(stack1)
|
||||
+ "'); return false;\">\n Expand\n </a>\n </li>\n </ul>\n</div>\n<ul class='endpoints' id='";
|
||||
+ "'); return false;\">\n Expand\n </a>\n </li>\n ";
|
||||
|
||||
buffer += "<li>\n <a href='" + depth0.url + "'>Raw</a> \n </li>\n ";
|
||||
buffer += "</ul>\n</div>\n<ul class='endpoints' id='";
|
||||
if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
|
||||
else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
|
||||
buffer += escapeExpression(stack1)
|
||||
|
|
|
@ -430,7 +430,18 @@
|
|||
name = "",
|
||||
edgeDefinitions = [{collection : "", from : "", to :""}],
|
||||
orphanCollections = "",
|
||||
title;
|
||||
title,
|
||||
sorter = function(l, r) {
|
||||
l = l.toLowerCase();
|
||||
r = r.toLowerCase();
|
||||
if (l < r) {
|
||||
return -1;
|
||||
}
|
||||
if (l > r) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
};
|
||||
|
||||
this.eCollList = [];
|
||||
this.removedECollList = [];
|
||||
|
@ -510,7 +521,7 @@
|
|||
false,
|
||||
true,
|
||||
1,
|
||||
self.eCollList
|
||||
self.eCollList.sort(sorter)
|
||||
)
|
||||
);
|
||||
} else {
|
||||
|
@ -525,7 +536,7 @@
|
|||
true,
|
||||
false,
|
||||
1,
|
||||
self.eCollList
|
||||
self.eCollList.sort(sorter)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
@ -540,7 +551,7 @@
|
|||
false,
|
||||
false,
|
||||
10,
|
||||
collList
|
||||
collList.sort(sorter)
|
||||
)
|
||||
);
|
||||
tableContent.push(
|
||||
|
@ -554,7 +565,7 @@
|
|||
false,
|
||||
false,
|
||||
10,
|
||||
collList
|
||||
collList.sort(sorter)
|
||||
)
|
||||
);
|
||||
self.counter++;
|
||||
|
@ -572,7 +583,7 @@
|
|||
false,
|
||||
false,
|
||||
10,
|
||||
collList
|
||||
collList.sort(sorter)
|
||||
)
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in New Issue