Audit plugin

mchapman · mchapman · commit c8dc568bc737 · 2017-11-27T22:14:11.000Z
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -48,6 +48,17 @@ gulp.task('build', function(callback) {
     callback);
 });
 
+gulp.task('debugBuild', function(callback) {
+  runSequence(
+    'compile',
+    'templates',
+    'concatTemplates',
+    'annotate',
+    'tidy',
+    'less',
+    callback);
+});
+
 gulp.task('compile', function(callback) {
   runSequence(
     'compileServerSide',
diff --git a/js/services/fng-routes.ts b/js/services/fng-routes.ts
@@ -163,27 +163,30 @@ module fng.services {
                   }
                 }
 
-                var locationParts = locationSplit.length;
+                let locationParts = locationSplit.length;
                 if (locationSplit[1] === 'analyse') {
                   lastObject.analyse = true;
                   lastObject.modelName = locationSplit[2];
                   lastObject.reportSchemaName = locationParts >= 4 ? locationSplit[3] : null;
                 } else {
                   lastObject.modelName = locationSplit[1];
-                  var lastParts = [locationSplit[locationParts - 1], locationSplit[locationParts - 2]];
-                  var newPos = lastParts.indexOf('new');
-                  var editPos;
+                  let lastParts = [locationSplit[locationParts - 1], locationSplit[locationParts - 2]];
+                  let newPos = lastParts.indexOf('new');
+                  let actionPos;
                   if (newPos === -1) {
-                    editPos = lastParts.indexOf('edit');
-                    if (editPos !== -1) {
-                      locationParts -= (2 + editPos);
+                    actionPos = postActions.reduce((previousValue, currentValue) => {
+                      let pos = lastParts.indexOf(currentValue);
+                      return pos > -1 ? pos : previousValue
+                    }, -1);
+                    if (actionPos !== -1) {
+                      locationParts -= (2 + actionPos);
                       lastObject.id = locationSplit[locationParts];
                     }
                   } else {
                     lastObject.newRecord = true;
                     locationParts -= (1 + newPos);
                   }
-                  if (editPos === 1 || newPos === 1) {
+                  if (actionPos === 1 || newPos === 1) {
                     lastObject.tab = lastParts[0];
                   }
                   if (locationParts > 2) {
@@ -192,6 +195,7 @@ module fng.services {
                 }
               }
               return lastObject;
+
             };
 ///**
 // * DominicBoettger wrote:
diff --git a/server/data_form.js b/server/data_form.js
@@ -1095,4 +1095,3 @@ DataForm.prototype.entityList = function () {
         });
     }, this);
 };
-//# sourceMappingURL=data_form.js.map
diff --git a/server/data_form.ts b/server/data_form.ts
@@ -156,7 +156,7 @@ DataForm.prototype.getListFields = function (resource: Resource, doc: Document,
  * Registers all REST routes with the provided `app` object.
  */
 DataForm.prototype.registerRoutes = function () {
-  const search = 'search/', schema = 'schema/', report = 'report/', resourceName = ':resourceName', id = '/:id'
+  const search = 'search/', schema = 'schema/', report = 'report/', resourceName = ':resourceName', id = '/:id';
   this.app.get.apply(this.app, processArgs(this.options, ['models', this.models()]));
 
   this.app.get.apply(this.app, processArgs(this.options, [search + resourceName, this.search()]));
