mirror of https://gitee.com/bigwinds/arangodb
The web interface now does not fail anymore if it cannot connect to github.com. Appropriate information is generated.
This commit is contained in:
parent
69e4665bf5
commit
962dec57f2
|
@ -352,7 +352,8 @@ controller.get('/foxxes/fishbowl', function (req, res) {
|
||||||
FoxxManager.update();
|
FoxxManager.update();
|
||||||
res.json(FoxxManager.availableJson());
|
res.json(FoxxManager.availableJson());
|
||||||
}).summary("List of all foxx apps submitted to the fishbowl store.")
|
}).summary("List of all foxx apps submitted to the fishbowl store.")
|
||||||
.notes("This function contacts the fishbowl and reports which apps are available for install");
|
.notes("This function contacts the fishbowl and reports which apps are available for install")
|
||||||
|
.errorResponse(ArangoError, 503, "Could not connect to store.");
|
||||||
|
|
||||||
/** List available Documentation
|
/** List available Documentation
|
||||||
*
|
*
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6,9 +6,6 @@
|
||||||
* http://hayageek.com/
|
* http://hayageek.com/
|
||||||
*/
|
*/
|
||||||
(function ($) {
|
(function ($) {
|
||||||
if ($.fn.ajaxForm == undefined) {
|
|
||||||
$.getScript("http://malsup.github.io/jquery.form.js");
|
|
||||||
}
|
|
||||||
var feature = {};
|
var feature = {};
|
||||||
feature.fileapi = $("<input type='file'/>").get(0).files !== undefined;
|
feature.fileapi = $("<input type='file'/>").get(0).files !== undefined;
|
||||||
feature.formdata = window.FormData !== undefined;
|
feature.formdata = window.FormData !== undefined;
|
||||||
|
|
|
@ -42,14 +42,6 @@
|
||||||
$('#'+clicked).click();
|
$('#'+clicked).click();
|
||||||
},
|
},
|
||||||
|
|
||||||
/*
|
|
||||||
uploadSetup: function (e) {
|
|
||||||
console.log("Set allowed true");
|
|
||||||
var files = e.target.files || e.dataTransfer.files;
|
|
||||||
this.file = files[0];
|
|
||||||
this.allowUpload = true;
|
|
||||||
},
|
|
||||||
*/
|
|
||||||
sorting: function() {
|
sorting: function() {
|
||||||
if ($('#appsDesc').is(":checked")) {
|
if ($('#appsDesc').is(":checked")) {
|
||||||
this.collection.setSortingDesc(true);
|
this.collection.setSortingDesc(true);
|
||||||
|
@ -822,6 +814,9 @@
|
||||||
_.each(_.sortBy(list, "name"), function(app) {
|
_.each(_.sortBy(list, "name"), function(app) {
|
||||||
table.append(listTempl.render(app));
|
table.append(listTempl.render(app));
|
||||||
});
|
});
|
||||||
|
}).fail(function() {
|
||||||
|
var table = $("#appstore-content");
|
||||||
|
table.append("<tr><td>Store is not available. ArangoDB is not able to connect to github.com</td></tr>");
|
||||||
});
|
});
|
||||||
this.setNewAppValidators();
|
this.setNewAppValidators();
|
||||||
}
|
}
|
||||||
|
|
|
@ -217,6 +217,7 @@
|
||||||
"frontend/js/lib/jquery.wiggle.min.js",
|
"frontend/js/lib/jquery.wiggle.min.js",
|
||||||
"frontend/js/lib/jquery.contextmenu.js",
|
"frontend/js/lib/jquery.contextmenu.js",
|
||||||
"frontend/js/lib/jquery.hotkeys.js",
|
"frontend/js/lib/jquery.hotkeys.js",
|
||||||
|
"frontend/js/lib/jquery.form.js",
|
||||||
"frontend/js/lib/jquery.uploadfile.js",
|
"frontend/js/lib/jquery.uploadfile.js",
|
||||||
"frontend/js/lib/select2.min.js",
|
"frontend/js/lib/select2.min.js",
|
||||||
"frontend/js/lib/handlebars-1.0.rc.1.js",
|
"frontend/js/lib/handlebars-1.0.rc.1.js",
|
||||||
|
|
Loading…
Reference in New Issue