add_more ok

app/models/user/attribute_field.rb

@@ -13,10 +13,10 @@ class AttributeField
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
   field :to_delete,:type=> Boolean,:default => false
-  field :typeA,:type=> Hash,:default=>{}
+  field :typeA,:type=> Hash,:default=>{:cross_lang=>false}
   field :typeB,:type=> Hash,:default=>{}
-  field :typeC,:type=> Hash,:default=>{:claendar=>"west_claendar"}
-  field :typeD,:type=> Hash,:default=>{}
+  field :typeC,:type=> Hash,:default=>{:claendar=>"west_claendar",:format=>"format3"}
+  field :typeD,:type=> Hash,:default=>{:cross_lang=>false}
   field :typeE,:type=> Hash,:default=>{}
 
 
@@ -30,6 +30,11 @@ class AttributeField
   has_many :attribute_values,:autosave => true, :dependent => :destroy
   before_save :check_option_list
   # validates_uniqueness_of :key
+
+  def markup_value
+    get_data["option_list"]
+  end
+
   def add_more
      (get_data["add_more"] == "true" ? true : false) rescue false
   end
@@ -47,11 +52,11 @@ class AttributeField
     (self.attribute.role.method(self[:key].pluralize.to_sym)  && self.attribute.role.method(self[:key].pluralize+"_for_"+markup)) rescue false
   end
 
-  def markup_value=(var)
-    if !self_defined_markup_options?
-      self[:markup_value] = (eval(var)  rescue {})
-    end
-  end
+  # def markup_value=(var)
+  #   if !self_defined_markup_options?
+  #     self[:markup_value] = (eval(var)  rescue {})
+  #   end
+  # end
 
   def option_list
     if self_defined_markup_options?
@@ -82,7 +87,7 @@ class AttributeField
   end
 
   def role
-    self.attribute.role
+    self.attribute.role 
   end
 
   def panel
@@ -138,7 +143,48 @@ class AttributeField
   # def select_list_options
   #   self.list_options.to_a.join(', ')
   # end
-  
+
+  def add_more_convert(opt) 
+    case opt
+    when :to_add_more
+      self.attribute_values.each  do |av|
+        VALID_LOCALES.each  do |loc|
+          splited_str = av[loc].split(",") rescue []
+          av["val"] = [] if av["val"].nil? 
+          splited_str.each_with_index{|value,index| av["val"][index] = av["val"][index].nil? ?  {loc=>value} : av["val"][index].merge(loc=>value) }
+          # av[loc] = Hash[splited_str.each_with_index.map{|t,index| [index.to_s,t]}] rescue {"0"=>av[loc].to_s}
+        end
+        av.save
+      end #of self.attribute_values.each
+    when :to_no_add_more
+      self.attribute_values.each  do |av|
+        VALID_LOCALES.each  do |loc|
+          if av["val"].kind_of? Array
+           av[loc] = av["val"].collect{|t| t[loc]}.join(",")
+          else
+            av[loc] = av["val"]
+          end
+          # av[loc] = av["val"].invert.keys.join(",") rescue av["val"]
+          # av.save(:validate => false)
+        end
+        av.unset("val")
+        av.save
+      end #of self.attribute_values.each
+    end
+  end
+
+  def typeA=(var)
+    if self["typeA"]["add_more"] != var["add_more"]
+      case var["add_more"]
+      when "true"  #from no-add_more to add_more
+        add_more_convert(:to_add_more)  
+      else #from add_more to no-add_more
+        add_more_convert(:to_no_add_more)
+      end # of case
+    end # of if
+    self["typeA"] = var
+  end
+
   def is_built_in?
     self.built_in
   end