Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

arangod/V8Server/v8-vocbase.cpp

@@ -2726,7 +2726,11 @@ static void JS_DecodeRev(v8::FunctionCallbackInfo<v8::Value> const& args) {
   time_t timeSeconds = timeMilli / 1000;
   uint64_t millis = timeMilli % 1000;
   struct tm date;
+#ifdef _WIN32
+  gmtime_s(&date, &timeSeconds);
+#else
   gmtime_r(&timeSeconds, &date);
+#endif
   char buffer[32];
   strftime(buffer, 32, "%Y-%m-%dT%H:%M:%S.000Z", &date);
   buffer[20] = (millis / 100) + '0';

js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js

@@ -44,8 +44,20 @@
     },
 
     resize: function () {
+      console.log('resizing');
+      var dropdownVisible = false;
+      _.each($('.documentsDropdown').first().children(), function (elem) {
+        if ($(elem).is(':visible')) {
+          dropdownVisible = true;
+        }
+      });
+      if (dropdownVisible) {
+        $('#docPureTable').height($('.centralRow').height() - 210 - 57);
+        $('#docPureTable .pure-table-body').css('max-height', $('#docPureTable').height() - 47);
+      } else {
         $('#docPureTable').height($('.centralRow').height() - 210);
         $('#docPureTable .pure-table-body').css('max-height', $('#docPureTable').height() - 47);
+      }
     },
 
     setCollectionId: function (colid, page) {
@@ -282,8 +294,13 @@
       this.changeEditMode();
       $('#filterHeader').hide();
       $('#importHeader').hide();
-      $('#editHeader').slideToggle(200);
+      $('#editHeader').slideToggle(1);
       $('#exportHeader').hide();
+
+      var self = this;
+      window.setTimeout(function () {
+        self.resize();
+      }, 50);
     },
 
     filterCollection: function () {
@@ -296,7 +313,12 @@
       $('#importHeader').hide();
       $('#editHeader').hide();
       $('#exportHeader').hide();
-      $('#filterHeader').slideToggle(200);
+      $('#filterHeader').slideToggle(1);
+
+      var self = this;
+      window.setTimeout(function () {
+        self.resize();
+      }, 50);
 
       var i;
       for (i in this.filters) {
@@ -314,10 +336,14 @@
       this.changeEditMode(false);
       $('#exportCollection').toggleClass('activated');
       this.markFilterToggle();
-      $('#exportHeader').slideToggle(200);
+      $('#exportHeader').slideToggle(1);
       $('#importHeader').hide();
       $('#filterHeader').hide();
       $('#editHeader').hide();
+      var self = this;
+      window.setTimeout(function () {
+        self.resize();
+      }, 50);
     },
 
     importCollection: function () {
@@ -326,10 +352,14 @@
       this.changeEditMode(false);
       $('#importCollection').toggleClass('activated');
       $('#exportCollection').removeClass('activated');
-      $('#importHeader').slideToggle(200);
+      $('#importHeader').slideToggle(1);
       $('#filterHeader').hide();
       $('#editHeader').hide();
       $('#exportHeader').hide();
+      var self = this;
+      window.setTimeout(function () {
+        self.resize();
+      }, 50);
     },
 
     changeEditMode: function (enable) {

js/apps/system/_api/foxx/APP/index.js

@@ -296,7 +296,7 @@ instanceRouter.use('/development', devRouter)
 .response(200, schemas.fullInfo, `Description of the service.`);
 
 devRouter.post((req, res) => {
-  const service = fm.development(req.service);
+  const service = fm.development(req.service.mount);
   res.json(serviceToJson(service));
 })
 .summary(`Enable development mode`)
@@ -306,7 +306,7 @@ devRouter.post((req, res) => {
 `);
 
 devRouter.delete((req, res) => {
-  const service = fm.production(req.service);
+  const service = fm.production(req.service.mount);
   res.json(serviceToJson(service));
 })
 .summary(`Disable development mode`)