From 407c5a839ba9173e863c4d5826baef53226d5590 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Thu, 19 Mar 2015 08:29:30 +0200
Subject: [PATCH] Fix: allow Unicode and other special chars in column names

Stopped using Angular's $parse and just accessing the property directly.
---
 rd_ui/app/scripts/ng_smart_table.js     | 16 ++++++----------
 rd_ui/app/scripts/services/resources.js | 18 ------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/rd_ui/app/scripts/ng_smart_table.js b/rd_ui/app/scripts/ng_smart_table.js
index 085df567b0..434b65758c 100644
--- a/rd_ui/app/scripts/ng_smart_table.js
+++ b/rd_ui/app/scripts/ng_smart_table.js
@@ -205,11 +205,10 @@
                         column = scope.column,
                         row = scope.dataRow,
                         format = filter('format'),
-                        getter = parse(column.map),
                         childScope;
 
                     //can be useful for child directives
-                    scope.formatedValue = format(getter(row), column.formatFunction, column.formatParameter);
+                    scope.formatedValue = format(row[column.map], column.formatFunction, column.formatParameter);
 
                     function defaultContent() {
                         //clear content
@@ -267,12 +266,11 @@
                 replace: true,
                 link: function (scope, element, attrs, ctrl) {
                     var form = angular.element(element.children()[1]),
-                        input = angular.element(form.children()[0]),
-                        getter = parse(scope.column.map);
+                        input = angular.element(form.children()[0]);
 
                     //init values
                     scope.isEditMode = false;
-                    scope.value = getter(scope.row);
+                    scope.value = scope.row[scope.column.map];
 
 
                     scope.submit = function () {
@@ -285,7 +283,7 @@
                     };
 
                     scope.toggleEditMode = function () {
-                        scope.value = getter(scope.row);
+                        scope.value = scope.row[scope.column.map];
                         scope.isEditMode = scope.isEditMode !== true;
                     };
 
@@ -595,13 +593,11 @@
              */
             this.updateDataRow = function (dataRow, propertyName, newValue) {
                 var index = scope.displayedCollection.indexOf(dataRow),
-                    getter = parse(propertyName),
-                    setter = getter.assign,
                     oldValue;
                 if (index !== -1) {
-                    oldValue = getter(scope.displayedCollection[index]);
+                    oldValue = scope.displayedCollection[index][propertyName];
                     if (oldValue !== newValue) {
-                        setter(scope.displayedCollection[index], newValue);
+                        scope.displayedCollection[index][propertyName] = newValue;
                         scope.$emit('updateDataRow', {item: scope.displayedCollection[index]});
                     }
                 }
diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
index e3730c2020..aa6a7f53d1 100644
--- a/rd_ui/app/scripts/services/resources.js
+++ b/rd_ui/app/scripts/services/resources.js
@@ -243,27 +243,9 @@
       return parts[0];
     };
 
-    var charConversionMap = {
-      '__pct': /%/g,
-      '_': / /g,
-      '__qm': /\?/g,
-      '__brkt': /[\(\)\[\]]/g,
-      '__dash': /-/g,
-      '__amp': /&/g,
-      '__dot': /\./g,
-      '__sl': /\//g,
-      '__fsl': /\\/g,
-    };
-
     QueryResult.prototype.getColumnCleanName = function (column) {
       var name = this.getColumnNameWithoutType(column);
 
-      if (name != '') {
-        _.each(charConversionMap, function(regex, replacement) {
-          name = name.replace(regex, replacement);
-        });
-      }
-
       return name;
     }