color helper

[pettanr/pettanr.git] / app / assets / javascripts / locmare / form / field / tag / select.js.coffee

diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
index ecffc19..5bdb03e 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
@@ -1,4 +1,4 @@
-class Locmare.FormModule.FieldModule.TagModule.Select extends Locmare.FormModule.FieldModule.TagModule.Base\r
+class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormModule.FieldModule.TagModule.Base\r
   tagName: 'select'\r
   \r
   render: () ->\r
@@ -8,25 +8,26 @@ class Locmare.FormModule.FieldModule.TagModule.Select extends Locmare.FormModule
     }\r
     _.extend(@attr, @options())\r
     this.$el.attr(@attr)\r
+    _this = this\r
     _.each @select_values(), (member) ->\r
-      selected = if @is_selected(member)\r
+      selected = if _this.is_selected(member)\r
         ' selected'\r
       else\r
         ''\r
-      _this.$el.append('<option value="' + @select_value() + '"' + selected + '></option>')\r
+      _this.$el.append('<option value="' + member[1] + '"' + selected + '>' + member[0] + '</option>')\r
     this\r
   \r
   model_manifest: () ->\r
     Manifest.manifest().models[@field.field_manifest.model_name()]\r
   \r
   model_attribute_manifest: () ->\r
-    @model_manifest().get(@field.field_manifest.column_name())\r
+    @model_manifest().attributes[@field.field_manifest.column_name()]\r
   \r
   select_item_name: () ->\r
     @model_attribute_manifest().source.select_item_name\r
   \r
   items: () ->\r
-    if @model_attribute_manifest().source.type == 'model'\r
+    if @model_attribute_manifest().source.type == 'magic_number'\r
       Manifest.manifest().system_resources.select_items[@select_item_name()]\r
     else\r
       resource_model_name = @model_attribute_manifest().source.resource_model_name\r
@@ -53,5 +54,5 @@ class Locmare.FormModule.FieldModule.TagModule.Select extends Locmare.FormModule
     if @source_by_model()\r
       @items()\r
     else\r
-      Pettanr.t_select_items(@items())\r
+      Pettanr.AppHelper.t_select_items(@items())\r
   \r