Merge branch 'feature/5303' into develop

app/components/uitemplates/uitemplates.js

@@ -6,9 +6,9 @@
  * (GPLv3).  See LICENSE.txt for details.
  */
 
-angular.module('ulakbus.uitemplates', ['ngRoute', 'schemaForm', 'ulakbus.formService'])
+var app=angular.module('ulakbus.uitemplates', ['ngRoute', 'ulakbus.formService']);
 
-    .controller('NewDesignsCtrl', function ($scope) {
+    app.controller('NewDesignsCtrl', function ($scope) {
         $scope.items = ['student', 'staff', 'academician'];
         $scope.selection = $scope.items[0];
     })
@@ -18,17 +18,19 @@ angular.module('ulakbus.uitemplates', ['ngRoute', 'schemaForm', 'ulakbus.formSer
     "name" for defining the name shown in dropdown box. Paste the JSON of form as a member of $scope.forms.
      */
 
-    .controller('FormServicePg', function ($scope, Generator) {
+    app.controller('FormServicePg', function ($scope, Generator) {
         $scope.forms = [
             {
                 name: 'Deneme Form 1',
-                form: ['email', 'id', 'name'],
+                form: ['email', 'id', 'name', 'novalid'],
                 schema: {
                     properties: {
                         email: {title: 'email', type: 'string'},
                         id: {title: 'id', type: 'number'},
-                        name: {title: 'name', type: 'string'}
-                    }, required: [], type: 'object', title: 'servicetest'
+                        name: {title: 'name', type: 'string'},
+                        novalid: { type: "button", cmd:"list_user2", title: "submit without validation", form_validate: false }
+
+                    }, required: ["email", "id", "name"], type: 'object', title: 'servicetest'
                 },
                 model: {
                     email: 'test@test.com', id: 2, name: 'travolta'
@@ -36,12 +38,7 @@ angular.module('ulakbus.uitemplates', ['ngRoute', 'schemaForm', 'ulakbus.formSer
             },
             {
                 name: 'Deneme Form 2',
-                form: ['email', 'id', 'name',
-                        { type:'button', title:'DickButt1DickButt1DickButt1' },
-                        { type:'button', title:'DickButt2DickButt2DickButt2' },
-                        { type:'button', title:'DickButt3DickButt3DickButt3' },
-
-                ],
+                form: ['email', 'id', 'name'],
                 schema: {
                     properties: {
                         email: {title: 'email', type: 'string'},

app/zetalib/form_service.js

@@ -333,11 +333,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                         if (scope.modalElements) {
                             scope.submitModalForm();
                         } else {
-                            if (v.validation === false || !v.form_validate) {
+                            if (!v.form_validate && angular.isDefined(v.form_validate)) {
                                 generator.submit(scope, redirectTo);
                             } else {
                                 scope.$broadcast('schemaFormValidate');
-                                if (scope[workOnForm].$valid || !v.form_validate) {
+                                if (scope[workOnForm].$valid) {
                                     generator.submit(scope, redirectTo);
                                     scope.$broadcast('disposeModal');
                                 } else {