Merge branch 'Feature/issue18'

Gruntfile.js

@@ -330,7 +330,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-preprocess');
     grunt.loadNpmTasks('grunt-env');
 
-    grunt.registerTask('dev', ['env:dev', 'preprocess:dev', 'html2js:dev', 'default', 'watch:dev']);
+    grunt.registerTask('dev', ['env:dev', 'preprocess:dev', 'html2js:dev', 'default']);
     grunt.registerTask('test', ['bower', 'karma:continuous']);
     grunt.registerTask('i18n', ['nggettext_extract', 'nggettext_compile']);
     grunt.registerTask('local_prod', ['bower', 'env:prod', 'preprocess:prod', 'nggettext_compile', 'concat:js', 'concat:css', 'concat:components', 'copy:local_prod', 'html2js:prod', 'uglify:dist', 'connect:prod_server', 'watch:local_prod']);

app/components/crud/crud_controller.js

@@ -66,12 +66,12 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
                 });
                 angular.forEach(scope.objects, function (value, key) {
                     if (value!=='-1') {
-                        var linkIndexes = [];
+                        var linkIndexes = {};
                         angular.forEach(value.actions, function (v, k) {
-                            if (v.show_as === 'link') {linkIndexes= v.fields}
+                            if (v.show_as === 'link') {linkIndexes = v}
                         });
                         angular.forEach(value.fields, function (v, k) {
-                            scope.objects[key].fields[k] = {type: linkIndexes.indexOf(k) > -1 ? 'link' : 'str', content: v};
+                            scope.objects[key].fields[k] = {type: linkIndexes.fields.indexOf(k) > -1 ? 'link' : 'str', content: v, cmd: linkIndexes.cmd};
                         });
                     }
                 });
@@ -178,22 +178,23 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
                 }
             };
 
-            $scope.do_action = function (key, action) {
-                Generator.doItemAction($scope, key, action);
+            $scope.do_action = function (key, cmd) {
+                Generator.doItemAction($scope, key, cmd);
             };
 
-            //$scope.searchForm = ['searchbox', {type: "submit", title: "Ara"}];
-            //$scope.searchSchema = {
-            //    type: "object",
-            //    properties: {searchbox: {type: "string", minLength: 2, title: "Ara", "x-schema-form": {placeholder: "Arama kriteri giriniz..."}}},
-            //    required: ['searchbox']
-            //};
-            //$scope.searchModel = {searchbox: ''};
-            //$scope.searchSubmit = function (form) {
-            //    if(form.$valid) {
-            //        Generator.submit({url: 'search', model: $scope.searchModel, form_params: {}});
-            //    }
-            //}
+            $scope.pagination = {page:1, total_pages:8};
+
+            $scope.getNumber = function (num) {
+                return new Array(num);
+            };
+
+            // reloadData must be a json object
+            $scope.reload = function (reloadData) {
+                $scope.form_params.cmd = $scope.reload_cmd;
+                $scope.form_params = angular.extend($scope.form_params, reloadData);
+                $log.debug('reload data', $scope);
+                Generator.get_wf($scope);
+            };
         }
 
         if ($routeParams.cmd === 'reload') {

app/components/crud/templates/list.html

@@ -34,7 +34,7 @@
                 <td ng-repeat="field in object.fields track by $index">
                     <a ng-href="javascript:void(0)"
                        ng-if="field.type==='link'"
-                       ng-click="do_action(object.key, action)">{{field.content}}</a>
+                       ng-click="do_action(object.key, field.cmd)">{{field.content}}</a>
                     <span ng-if="field.type==='str'">{{field.content}}</span>
                 </td>
 
@@ -66,6 +66,25 @@
         </ul>
     </div>
 
+    <nav ng-if="pagination" class="text-center">
+        <ul class="pagination">
+            <li ng-class="{disabled:pagination.page===1}">
+                <a href="javascript:void(0)" aria-label="Önceki" ng-click="reload({page:pagination.page-1})">
+                    <span aria-hidden="true">&laquo;</span>
+                </a>
+            </li>
+            <li ng-repeat="page in getNumber(pagination.total_pages) track by $index"
+                ng-class="{active:$index+1===pagination.page}">
+                <a href="javascript:void(0)" ng-click="reload({page:$index+1})">{{$index+1}}</a>
+            </li>
+            <li ng-class="{disabled:pagination.page===pagination.total_pages}">
+                <a href="javascript:void(0)" aria-label="Sonraki" ng-click="reload({page:pagination.page+1})">
+                    <span aria-hidden="true">&raquo;</span>
+                </a>
+            </li>
+        </ul>
+    </nav>
+
     <hr>
 
 </div>
\ No newline at end of file

app/zetalib/form_service.js

@@ -294,8 +294,8 @@ angular.module('formService', [])
                 return newdatearray.join('.');
             }
         };
-        generator.doItemAction = function ($scope, key, action) {
-            $scope.form_params.cmd = action.cmd;
+        generator.doItemAction = function ($scope, key, cmd) {
+            $scope.form_params.cmd = cmd;
             $scope.form_params.object_id = key;
             $scope.form_params.param = $scope.param;
             $scope.form_params.id = $scope.param_id;