Merge branch 'feature/5296' into develop

app/components/uitemplates/uitemplates.js

@@ -51,8 +51,8 @@ angular.module('ulakbus.uitemplates', ['ngRoute', 'ulakbus.crud'])
                             type:'confirm',
                             confirm_message:"Lorem Ipsum Dolor Sit Amet",
                             buttons: [
-                                {   text: "button 1", cmd:"zeaaa", style: "btn-warning"},
-                                {   text: "button 2", cmd:"cmd1", style: "btn-success"}
+                                {   text: "button 1", cmd:"cmd1", style: "btn-warning"},
+                                {   text: "button 2", cmd:"cmd2", style: "btn-success"}
                             ],
                             readonly:"true",
                             form_validate: false}

app/shared/templates/listnodeModalContent.html

@@ -3,5 +3,5 @@
     <form name="modalForm" sf-schema="schema" sf-form="form" sf-model="model" modal-form-locator></form>
 </div>
 <div class="modal-footer">
-    <button ng-repeat="b in buttons" type="{{b.type}}" class="btn {{b.style || 'btn-default'}}" ng-click="onNodeBtnClk(b)">{{b.text}}</button>
+    <button ng-repeat="b in schema.footerButtons" type="{{b.type}}" class="btn {{b.style || 'btn-default'}}" ng-click="onNodeBtnClk(b)">{{b.text}}</button>
 </div>
\ No newline at end of file

app/zetalib/form_service.js

@@ -58,6 +58,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
          */
         generator.generate = function (scope, data) {
 
+            $log.debug("data before generation:", data);
             // if no form in response (in case of list and single item request) return scope
             if (!data.forms) {
                 return scope;
@@ -1405,6 +1406,12 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
             }
         };
 
+        // $scope.onNodeSubmit = function () {
+        //     $scope.$broadcast('schemaFormValidate');
+        //     if ($scope.modalForm.$valid) {
+        //         $uibModalInstance.close($scope);
+        //     }
+        // };
         $scope.cancel = function () {
             $uibModalInstance.dismiss('cancel');
         };
@@ -1460,6 +1467,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                                     scope.node.schema.properties[key].list_cmd = 'select_list';
                                 });
 
+                                // scope.node.schema.footerButtons = [
+                                //     {type: "submit", text:"Onayla", style:"btn-success" },
+                                //     {type: "button", text:"Vazgec", style:"btn-danger" },
+                                // ]
+
                                 var newscope = {
                                     wf: scope.node.wf,
                                     url: scope.node.url,