From cf5af072b8e4f62a80713a51634e6fcbfacb2383 Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Mon, 11 Nov 2013 14:37:30 +0100 Subject: [PATCH 1/4] Sort out "make distclean" to correctly delegate to icu. --- 3rdParty/Makefile.all-in-one-icu | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdParty/Makefile.all-in-one-icu b/3rdParty/Makefile.all-in-one-icu index 6acb8a6cf4..ddf03ff3b8 100644 --- a/3rdParty/Makefile.all-in-one-icu +++ b/3rdParty/Makefile.all-in-one-icu @@ -49,6 +49,7 @@ ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD CLEANUP_3RD += clean-icu clean-icu: + cd @top_srcdir@/3rdParty/icu/source && ( $(MAKE) clean || true ) rm -f @srcdir@/.icu-build-@TRI_BITS@ rm -rf $(ICUDIR) From fd3f0e9f98f9b0840572242e01ad20b76b49a217 Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Mon, 11 Nov 2013 15:04:59 +0100 Subject: [PATCH 2/4] Fixed typo in documentation. --- arangod/V8Server/v8-vocbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index 3262f52680..c10594eecc 100644 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -5595,7 +5595,7 @@ static v8::Handle JS_EnsurePriorityQueueIndexVocbaseCol (v8::Argument /// Creates a skiplist index on all documents using attributes as paths to /// the fields. At least one attribute must be given. /// All documents, which do not have the attribute path or -/// with ore or more values that are not suitable, are ignored. +/// with one or more values that are not suitable, are ignored. /// /// In case that the index was successfully created, the index identifier /// is returned. From b240e626533d4d42c9063bfcd7f0609694cf424e Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Mon, 11 Nov 2013 15:06:13 +0100 Subject: [PATCH 3/4] Fixed typo in documentation. --- arangod/V8Server/v8-vocbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index c10594eecc..951b855806 100644 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -5629,7 +5629,7 @@ static v8::Handle JS_LookupUniqueSkiplistVocbaseCol (v8::Arguments co /// Creates a multi skiplist index on all documents using attributes as paths to /// the fields. At least one attribute must be given. /// All documents, which do not have the attribute path or -/// with ore or more values that are not suitable, are ignored. +/// with one or more values that are not suitable, are ignored. /// /// In case that the index was successfully created, the index identifier /// is returned. From a037e7ba55fff3e998960b33ff5d1bb40666e568 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Mon, 11 Nov 2013 16:37:09 +0100 Subject: [PATCH 4/4] Added foxx mount move in the Web Interface --- js/apps/system/aardvark/aardvark.js | 18 ++++++- .../aardvark/frontend/js/models/foxx.js | 50 ++++++++++--------- .../frontend/js/templates/foxxEditView.ejs | 4 +- .../frontend/js/views/foxxEditView.js | 45 ++++++++++++++++- js/apps/system/aardvark/lib/foxxes.js | 5 ++ 5 files changed, 94 insertions(+), 28 deletions(-) diff --git a/js/apps/system/aardvark/aardvark.js b/js/apps/system/aardvark/aardvark.js index 0c8e21d97c..fc7d16566b 100644 --- a/js/apps/system/aardvark/aardvark.js +++ b/js/apps/system/aardvark/aardvark.js @@ -150,7 +150,23 @@ controller.get('/docu/:key/*', function(req, res) { allowMultiple: false }).summary("List the API for one foxx") .notes("This function lists the API of the foxx" - + " runnning under the given mount point"); + + " running under the given mount point"); + +// ............................................................................. +// Move one foxx from mount-point to another +// ............................................................................. + +controller.put('/foxx/move/:key', function(req, res) { + var body = req.body(); + var mountPoint = body.mount; + var app = body.app; + var key = req.params("key"); + var prefix = body.prefix; + foxxes.move(key, app, mountPoint, prefix); +}) +.summary("Move one foxx to another moint point") + .notes ("This function moves one installed foxx" + + " to a given mount point."); // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE diff --git a/js/apps/system/aardvark/frontend/js/models/foxx.js b/js/apps/system/aardvark/frontend/js/models/foxx.js index 5d635a55e8..6e3ac1e852 100644 --- a/js/apps/system/aardvark/frontend/js/models/foxx.js +++ b/js/apps/system/aardvark/frontend/js/models/foxx.js @@ -1,30 +1,32 @@ /*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */ /*global window, Backbone */ +(function() { -window.Foxx = Backbone.Model.extend({ - defaults: { - "title": "", - "version": "", - "mount": "", - "description": "", - "git": "", - "isSystem": false, - "development": false - }, + window.Foxx = Backbone.Model.extend({ + defaults: { + "title": "", + "version": "", + "mount": "", + "description": "", + "git": "", + "isSystem": false, + "development": false + }, - url: function() { - 'use strict'; + url: function() { + 'use strict'; - if (this.get("_key")) { - return "/_admin/aardvark/foxxes/" + this.get("_key"); + if (this.get("_key")) { + return "/_admin/aardvark/foxxes/" + this.get("_key"); + } + return "/_admin/aardvark/foxxes/install"; + }, + + isNew: function() { + 'use strict'; + + return false; } - return "/_admin/aardvark/foxxes/install"; - }, - - isNew: function() { - 'use strict'; - - return false; - } - -}); + + }); +}()); diff --git a/js/apps/system/aardvark/frontend/js/templates/foxxEditView.ejs b/js/apps/system/aardvark/frontend/js/templates/foxxEditView.ejs index 6a57362d32..d025886533 100644 --- a/js/apps/system/aardvark/frontend/js/templates/foxxEditView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/foxxEditView.ejs @@ -16,7 +16,7 @@ Mount: - + @@ -51,7 +51,7 @@