Form validation

applications/default/extensions/content-management/content-management.extension.json

@@ -0,0 +1,5 @@
+{
+  "title": "Content Management",
+  "description": "Provide management pages for content and related data.",
+  "dependencies": ["content", "management"]
+}

applications/default/extensions/content-management/content-management.js

@@ -0,0 +1,88 @@
+/*
+ * The Content Management extension.
+ */
+
+var contentManagement = module.exports;
+
+/**
+ * The page() hook.
+ */
+contentManagement.page = function(pages, callback) {
+  var self = this;
+  var newPages = {};
+
+  // Create form contents for all content subtypes.
+  var contentTypes = this.application.types['content'].subtypes;
+  for (var subtypeName in contentTypes) {
+    var subtypeSettings = contentTypes[subtypeName];
+    newPages['manage-content-add-' + subtypeSettings.name] = {
+      path: '/manage/content/add-' + subtypeSettings.name,
+      title: 'Add ' + subtypeSettings.title.toLowerCase(),
+      type: 'form',
+      formName: 'type-' + subtypeSettings.name + 'Content',
+      redirect: '/manage/content'
+    };
+  }
+
+  newPages['manage-extensions'] = {
+    path: '/manage/extensions',
+    title: 'Extensions',
+    subtitle: 'The building blocks',
+    description: 'Extensions are groups of functionality.',
+    access: 'manage-extensions',
+    callback: function(request, response, callback) {
+      var extensions = self.application.extensions;
+      var result = {};
+      for (var extensionName in extensions) {
+        var extension = extensions[extensionName];
+        result[extensionName] = {
+          title: extension.settings.title,
+          description: extension.settings.description
+        };
+      }
+      response.payload.page.items = result;
+      callback();
+    },
+    template: '/templates/list-group.html'
+  };
+
+  callback(null, newPages);
+};
+
+/**
+ * The navigation() hook.
+ */
+contentManagement.navigation = function(navigations, callback) {
+  var newNavigations = {};
+
+  // Create navigation dropdown with links for all content types forms.
+  var contentTypes = this.application.types['content'].subtypes;
+  var items = [];
+  for (var contentTypeName in contentTypes) {
+    var contentTypeSettings = contentTypes[contentTypeName];
+    items.push({
+      title: contentTypeSettings.title,
+      url: '/manage/content/add-' + contentTypeSettings.name
+    });
+  }
+
+  newNavigations['content-management-toolbar'] = {
+    title: 'Content management toolbar',
+    template: '/templates/btn-group.html',
+    classes: [
+      'btn-group-sm'
+    ],
+    items: [
+      {
+        type: 'dropdown',
+        title: 'Add',
+        items: items,
+        classes: [
+          'btn-primary'
+        ]
+      }
+    ]
+  };
+
+  callback(null, newNavigations);
+};

applications/default/extensions/content/content.extension.json

@@ -1,5 +1,5 @@
 {
   "title": "Content",
-  "description": "Content management festures.",
+  "description": "Content management features.",
   "dependencies": ["page"]
 }

applications/default/extensions/content/content.js

@@ -11,16 +11,16 @@ content.type = function(types, callback) {
     // Set created and update dates to now.
     // @todo: Allow created/updated date to be passed in some circunstances,
     // e.g. admin, import/export, etc.
-    data.created = Date.now();
-    data.updated = Date.now();
+    data.created = new Date();
+    data.updated = new Date();
     next();
   };
 
   type.beforeUpdate = function(settings, data, next) {
     // Set updated date to now.
     // @todo: Allow created date to be passed in some circunstances, e.g. admin,
     // import/export, etc.
-    data.updated = Date.now();
+    data.updated = new Date();
     next();
   };
 

applications/default/extensions/display/public/js/display.controllers.js

@@ -13,11 +13,15 @@ angular.module('choko')
     }
   }])
 
-.controller('DisplayFieldController', ['$scope', 'Params',
-  function ($scope, Params) {
+.controller('DisplayFieldController', ['$scope', 'Token',
+  function ($scope, Token) {
     if ($scope.field.fieldName in $scope.item) {
       $scope.value = $scope.item[$scope.field.fieldName];
     }
 
+    if ($scope.field.link) {
+      $scope.link = Token.replace($scope.field.link, $scope);
+    }
+
     $scope.template = $scope.field.template || '/templates/' + $scope.field.format + '.html';
   }]);

applications/default/extensions/display/public/templates/title.html

@@ -1 +1,2 @@
-<h4>{{value}}<h4>
+<h4 ng-if="link"><a href="{{link}}">{{value}}</a><h4>
+<h4 ng-if="!link">{{value}}<h4>

applications/default/extensions/field/field.js

@@ -1,5 +1,5 @@
 var async = require('async');
-var validator = require('validator/lib/validators');
+var validator = require('validator');
 var uuid = require('node-uuid');
 var utils = require('prana').utils;
 
@@ -30,6 +30,13 @@ field.field = function(fields, callback) {
   newFields['text'] = {
     title: 'Text',
     schema: function(settings) {
+      // If options and multiple is set, schema should be a array.
+      if (settings.options && settings.multiple) {
+        return {
+          type: 'array'
+        };
+      }
+
       var schema = {
         type: (settings.maxLength > 256) ? 'text' : 'string'
       };
@@ -50,13 +57,15 @@ field.field = function(fields, callback) {
       };
     },
     validate: function(settings, item, next) {
+      // @todo: validate if value is within options when it's a select field.
+
       // Default minLenght to 1.
       settings.minLength = settings.minLength || 1;
 
       // Default maxLenght to 256.
       settings.maxLength = settings.maxLength || 256;
 
-      next(null, !validator.notEmpty(item[settings.name]) || validator.len(item[settings.name].toString(), settings.minLength, settings.maxLength) || 'must have from ' + settings.minLength + ' to ' + settings.maxLength + ' characters.');
+      next(null, validator.isLength(item[settings.name].toString(), settings.minLength, settings.maxLength) || 'must have from ' + settings.minLength + ' to ' + settings.maxLength + ' characters.');
     }
   };
 
@@ -116,7 +125,7 @@ field.field = function(fields, callback) {
     validate: function(settings, item, next) {
       // Email validator oddly returns the email itself, so need to convert to
       // boolean.
-      next(null, !!validator.isEmail(item[settings.name].toString()) || 'must be a valid email.');
+      next(null, validator.isEmail(item[settings.name].toString()) || 'must be a valid email.');
     }
   };
 
@@ -128,7 +137,7 @@ field.field = function(fields, callback) {
     },
     element: 'url',
     validate: function(settings, item, next) {
-      next(null, validator.isUrl(item[settings.name].toString()) || 'must be a valid URL.');
+      next(null, validator.isURL(item[settings.name].toString()) || 'must be a valid URL.');
     }
   };
 
@@ -146,7 +155,7 @@ field.field = function(fields, callback) {
     element: 'password',
     validate: function(settings, item, next) {
       var minLength = settings.minLength || 6;
-      next(null, validator.len(item[settings.name].toString(), settings.minLength || 6) || 'must have at least ' + minLength + ' characters.');
+      next(null, validator.isLength(item[settings.name].toString(), settings.minLength || 6) || 'must have at least ' + minLength + ' characters.');
     }
   };
 

applications/default/extensions/file/file.js

@@ -1,6 +1,5 @@
 var path = require('path');
 var fs = require('fs');
-var validator = require('validator/lib/validators');
 var utils = require('prana').utils;
 
 var file = module.exports = {};

applications/default/extensions/form/form.js

@@ -58,9 +58,8 @@ form.form = function(forms, callback) {
   var newForms = {};
   var self = this;
 
-  // Create forms for every type on the system except 'type' and 'extension',
-  // the ones that have the 'form' property set to false, the ones that have
-  // no fields and the ones that are polymorphic.
+  // Create forms for every type on the system except the ones that have no
+  // fields and the ones that are polymorphic.
   async.each(Object.keys(self.application.types), function(typeName, next) {
     var typeSettings = self.application.types[typeName];
     if (!typeSettings.fields || typeSettings.polymorphic) {
@@ -130,6 +129,11 @@ form.form = function(forms, callback) {
         element.options = fieldSettings.options;
       }
 
+      // Forward 'multiple' property.
+      if (fieldSettings.multiple) {
+        element.multiple = fieldSettings.multiple;
+      }
+
       // Bypass 'internal' fields.
       if (fieldSettings.internal) {
         return next();

applications/default/extensions/form/public/js/form.controllers.js

@@ -48,7 +48,7 @@ angular.module('choko')
           $scope.progress = parseInt(100.0 * evt.loaded / evt.total);
         })
         .success(function(data, status, headers, config) {
-          $scope.data[$scope.element.name] = data.data.id;
+          $scope.data[$scope.element.name] = data.id;
         });
       }
     };

applications/default/extensions/form/public/templates/select.html

@@ -1,10 +1,6 @@
 <div ck-element class="form-group">
   <label ng-if="element.title" for="{{element.id}}">{{element.title}}</label>
-  <select ng-if="element.multiple" ng-model="data[element.name]" ng-required="element.required" name="{{element.name}}" id="{{element.id}}" class="form-control" multiple>
-    <option ng-repeat="(optionKey, option) in element.options" value="{{optionKey}}">{{option}}</option>
-  </select>
-  <select ng-if="!element.multiple" ng-model="data[element.name]" ng-required="element.required" name="{{element.name}}" id="{{element.id}}" class="form-control">
-    <option ng-repeat="(optionKey, option) in element.options" value="{{optionKey}}">{{option}}</option>
-  </select>
+  <select ng-if="element.multiple" ng-model="data[element.name]" ng-required="element.required" ng-options="optionKey as option for (optionKey, option) in element.options" id="{{element.id}}" class="form-control" multiple></select>
+  <select ng-if="!element.multiple" ng-model="data[element.name]" ng-required="element.required" ng-options="optionKey as option for (optionKey, option) in element.options" id="{{element.id}}" class="form-control"></select>
   <p ng-if="element.description" class="help-block">{{element.description}}</p>
 </div>

applications/default/extensions/form/public/templates/submit.html

@@ -1 +1 @@
-<button ck-button ng-click="submit(element.url, element.redirect || form.redirect)" ng-disabled="isClean() || [form.name].$invalid" ng-class="element.classes" type="submit" class="btn" id="{{element.id}}">{{element.title}}</button>
+<button ck-button ng-click="submit(element.url)" ng-disabled="isClean() || [form.name].$invalid" ng-class="element.classes" type="submit" class="btn" id="{{element.id}}">{{element.title}}</button>