Fix merge conflicts when merge feature/fix-list-node-view

Gruntfile.js

@@ -142,8 +142,10 @@ module.exports = function (grunt) {
                     "app/components/version/version.js",
                     "app/components/version/interpolate-filter.js",
                     "app/components/version/version-directive.js",
-                    "app/components/messaging/*.js"
+                    "app/components/messaging/messaging_service.js",
+                    "app/components/messaging/messaging.js"
                 ],
+                nonull: true,
                 dest: 'dist/app.js'
             },
             components: {
@@ -199,7 +201,8 @@ module.exports = function (grunt) {
                     'app/shared/directives.js',
                     'app/components/**/*controller.js',
                     'app/components/**/*service.js',
-                    'app/components/messaging/*.js',
+                    "app/components/messaging/messaging_service.js",
+                    "app/components/messaging/messaging.js"
                 ],
                 dest: 'dist/<%= grunt.branchname %>/app.js'
             },
@@ -323,7 +326,7 @@ module.exports = function (grunt) {
             dev: {
                 files: {
                     'app/index.html': 'app/main.html',
-                    'app/app.js': 'app/main.js',
+                    'app/app.js': 'app/main.js'
                 }
             },
             prod: {

app/components/crud/crud_controller.js

@@ -515,6 +515,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ui.bootstrap', 'ulakbus.formServi
         $scope.prepareTimetable = function prepareTimetable(timetable){
             var grouped = groupBy(timetable, "saat");
             for (var day in grouped){
+                if (!grouped.hasOwnProperty(day)) continue;
                 var dayItems = grouped[day];
                 grouped[day] = dayItems.sort(function(a, b){
                     return a.gun < b.gun ? -1 : 1;

app/components/crud/templates/nodeTable.html

@@ -19,7 +19,11 @@
                 </label>
             </th>
             <th scope="row" style="text-align:center">#</th>
+<<<<<<< 6a71c6920efc5235eff71bf42763b82cc30f1827
+            <th ng-repeat="prop in node.schema.properties_list">
+=======
             <th ng-repeat="propName in node.form" ng-init="prop = node.schema.properties[propName]">
+>>>>>>> FIX, rfix#5379. Fix ListNode's dose not respect schema order
                 <span ng-if="!value.verbose_name">{{prop.title||prop.name}}</span>
             </th>
             <th ng-if="meta.allow_actions!==false">İşlem</th>
@@ -42,14 +46,14 @@
             </td>
         </tr>
 
-        <tr ng-repeat="listnodemodel in node.items track by $index" ng-init="outerIndex=$index" ng-if="node.schema.formType=='ListNode'">
+        <tr ng-repeat="listnodemodel in node.items" ng-init="outerIndex=$index" ng-if="node.schema.formType=='ListNode'">
             <td ng-if="meta.allow_selection===true" width="60">
                 <label>
                     <input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
                 </label>
             </td>
             <th scope="row" style="text-align:center">{{$index+1}}</th>
-            <td ng-repeat="propName in node.form" ng-init="k = propName; v = listnodemodel[propName]; inline = node.schema.inline_edit && node.schema.inline_edit.indexOf(k) > -1">
+            <td ng-repeat="prop in node.schema.properties_list" ng-init="k = prop.name; v = listnodemodel[k]; inline = node.schema.inline_edit && node.schema.inline_edit.indexOf(k) > -1">
                 <span ng-if="!inline">{{ v.unicode || v }}</span>
                 <!--<input type="{{node.schema.properties[k].type}}"-->
                 <!--ng-if="node.schema.inline_edit.indexOf(k) > -1"-->

app/components/messaging/messaging.js

@@ -146,7 +146,7 @@ angular.module("ulakbus.messaging")
                     });
                 }
 
-                this.createDirectChannel = function(user){
+                iScope.createDirectChannel = function (user){
                     // user format is ['username', 'key', 'avatarUrl']
                     var key = user[1];
                     MessagingService.create_direct_channel(key)
@@ -155,8 +155,6 @@ angular.module("ulakbus.messaging")
                         })
                 };
 
-                iScope.createDirectChannel = this.createDirectChannel;
-
                 iScope.hideApp = function(){
                     iScope.chatAppIsHidden = true;
                     MessagingService.toggle_messaging_window_visibility(false);

app/main.html

@@ -32,7 +32,6 @@
     <!-- @if NODE_ENV == 'PRODUCTION' -->
     <link rel="stylesheet" href="css/app.css">
     <link rel="stylesheet" href="css/roboto/roboto.css">
-    <link rel="stylesheet" href="css/jquery-ui.min.css">
     <!-- @endif -->
 </head>
 <body ng-controller="KeyListenController" ng-keydown="down($event)">
@@ -147,7 +146,6 @@
 
 <!-- @if NODE_ENV == 'PRODUCTION' -->
 <script src="bower_components/jquery.min.js"></script>
-<script src="bower_components/jquery-ui.min.js"></script>
 <script src="bower_components/angular.js"></script>
 <script src="bower_components/components.js"></script>
 <script src="shared/translations.js"></script>

app/zetalib/socket.js

@@ -194,7 +194,7 @@ angular.module('ulakbus')
             }
             do_action(msg_data, msg_data.cmd);
             if (msg_data.msg != "pong"){
-                $log.info("MESSAGE:", event, "Data:", msg_data);
+                $log.info("MESSAGE:", event, "Data:", angular.copy(msg_data));
             }
         };
         wsOps.onError = function (evt) {

app/zetalib/utils_service.js

@@ -64,4 +64,30 @@ angular.module("ulakbus")
                 }
             }
         }
+
+        /**
+         * @param collection {Array|Object} Array of objects to group
+         * @param callback {Function} Callback to apply to every element of the collection
+         * @returns None
+         */
+        this.iterate = function(collection, callback){
+            angular.forEach(collection, function(val, key){
+                // don't iterate over angular binding indexes
+                if (key.indexOf && key.indexOf('$$') == 0){
+                    return;
+                }
+                callback(val, key);
+            })
+        }
+    })
+
+
+    .filter("formatJson", function(){
+        return function(val){
+            try {
+                return JSON.stringify(val, null, 4);
+            } catch(e){
+                return val;
+            }
+        }
     });