fix profiler

[pettanr/pettanr.git] / app / assets / javascripts / locmare / profiler / column / base.js.coffee

diff --git a/app/assets/javascripts/locmare/profiler/column/base.js.coffee b/app/assets/javascripts/locmare/profiler/column/base.js.coffee
index dcc8e32..dc6f550 100644 (file)
--- a/app/assets/javascripts/locmare/profiler/column/base.js.coffee
+++ b/app/assets/javascripts/locmare/profiler/column/base.js.coffee
@@ -69,7 +69,7 @@ class Locmare.ProfilerModule.ColumnModule.DateValue extends Backbone.View
     this\r
   \r
   value: () ->\r
-    l(@column.value())\r
+    l(@column.item().get(@column.column_name))\r
   \r
 class Locmare.ProfilerModule.ColumnModule.JsonValue extends Backbone.View\r
   tagName: 'pre'\r
@@ -82,7 +82,7 @@ class Locmare.ProfilerModule.ColumnModule.JsonValue extends Backbone.View
     this\r
   \r
   value: () ->\r
-    JSON.pretty_generate(JSON.parse(@column.value()))\r
+    JSON.stringify(JSON.parse(@column.item().get(@column.column_name)), 2)\r
   \r
 class Locmare.ProfilerModule.ColumnModule.ExtendValue extends Backbone.View\r
   tagName: 'div'\r
@@ -93,7 +93,11 @@ class Locmare.ProfilerModule.ColumnModule.ExtendValue extends Backbone.View
     _this = this\r
     _.each @extend_settings().column_names, (extend_column_name) ->\r
       extend_column_manifest = _this.extend_settings().columns[extend_column_name] || {}\r
-      _this.columns[extend_column_name] = new Locmare.ProfilerModule.ColumnModule.ExtendModule.ExtendColumn({column: _this, extend_column_name: extend_column_name, extend_column_manifest: extend_column_manifest})\r
+      _this.columns[extend_column_name] = new Locmare.ProfilerModule.ColumnModule.ExtendModule.ExtendColumn({\r
+        column: _this, \r
+        extend_column_name: extend_column_name, \r
+        extend_column_manifest: extend_column_manifest\r
+      })\r
   \r
   render: () ->\r
     _this = this\r
@@ -102,25 +106,25 @@ class Locmare.ProfilerModule.ColumnModule.ExtendValue extends Backbone.View
       _this.$el.append(extend_column.render().el)\r
     this\r
   \r
-  \r
-  extend_columns: () ->\r
+  sorted_columns: () ->\r
+    _this = this\r
     _.map @extend_settings().column_names, (column_name) ->\r
-      @columns[column_name]\r
+      _this.columns[column_name]\r
   \r
   extend_settings: () ->\r
-    @template_model_profiler().extend_settings[self.booster.model_name]\r
+    @template_model_profiler().extend_settings[@booster().model_name()]\r
   \r
   template_model_profiler: () ->\r
-    LocalManifest.manifest.profilers[@template_model().item_name]\r
+    LocalManifest.manifest().profilers[@template_model().item_name()]\r
   \r
   template_model: () ->\r
-    @booster().template_model\r
+    @booster().template_model()\r
   \r
   extend_item: () ->\r
-    @booster.extend_item\r
+    @booster().extend_item()\r
   \r
   booster: () ->\r
-    @column.item().boosters[@column_manifest.boost_name]\r
+    @column.item().boosters[@column.column_manifest.boost_name]\r
   \r
 class Locmare.ProfilerModule.ColumnModule.NoteNone\r
   \r