member for THU

app/helpers/application_helper.rb

@@ -1,7 +1,9 @@
 module ApplicationHelper
 
   FLASH_NOTICE_KEYS = [:error, :notice, :warning]
-
+  def check_user_role_enable(attribute_fields)
+    @user.attribute_values.collect{|t| attribute_fields.include?(t.attribute_field) }.include?(true) rescue false
+  end
   def show_attribute_value(value)
     if value.kind_of? Hash
         result = []

app/helpers/attribute_fields_helper.rb

@@ -8,8 +8,9 @@ module AttributeFieldsHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::RenderingHelper
 
-  def block_helper(user,index)
+  def block_helper(user,index,disable = false)
     @index = index
+    @markup_options = markup_options.merge(:disabled=>disable)
     @user = user
     @attribute_value = @user.get_value_from_field_id(id) 
     @new_attribute = @attribute_value.nil?  
@@ -29,10 +30,10 @@ module AttributeFieldsHelper
       if(add_more and value.is_a?(Array))
         values = value
         result << values.each_with_index.collect  do |value,index|
-          text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"),  value.last,markup_options)
+          text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"),  value.last,@markup_options)
         end.join.html_safe
       else
-      result << text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}]"),  value,markup_options)
+      result << text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}]"),  value,@markup_options)
       end
     
       result << ('<a href="#'+self.key+'-edit" class="btn" type="button" data-toggle="modal"><i class="icon-edit"></i></a>').html_safe
@@ -43,15 +44,16 @@ module AttributeFieldsHelper
   end
 
   def render_checkbox
+    markup_value = eval(self.markup_value) rescue {}
     control_group_wrapper do 
       markup_value.collect do |key,value|
-        label_tag(key,check_box_tag(get_field_name_base+"[#{key}]", value[I18n.locale.to_s],  (@prefiled_value==value ? true : false), {})+value[I18n.locale.to_s],markup_options.merge(:class=>"control-label"))
+        label_tag(key,check_box_tag(get_field_name_base+"[value][#{key}]", value[I18n.locale.to_s],  (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
       end.join rescue ""
     end
   end
 
   def render_date 
-    control_group_wrapper{date_select(get_field_name_base+"[value]",@prefiled_value,markup_options,:class=>"input-small")} 
+    control_group_wrapper{date_select(get_field_name_base+"[value]",nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")} 
   end
 
   def render_date_durnation #Need re-write low priority
@@ -59,36 +61,51 @@ module AttributeFieldsHelper
   end
 
   def render_radio_button 
+    markup_value = eval(self.markup_value) rescue {}
     control_group_wrapper do 
       markup_value.collect do |key,value|
-        label_tag(key,radio_button_tag(get_field_name_base, value[I18n.locale.to_s],  (@prefiled_value==value ? true : false), {})+value[I18n.locale.to_s],markup_options.merge(:class=>"control-label"))
+        label_tag(key,radio_button_tag(get_field_name_base+"[value][#{key}]", value[I18n.locale.to_s],  (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
       end.join rescue ""
     end
   end
 
   def render_select 
-    control_group_wrapper{select_tag( get_field_name_base+"[value]",options_for_select(markup_value.collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),markup_options)} rescue ""
+    markup_value = eval(self.markup_value) rescue {}
+    control_group_wrapper{select_tag( get_field_name_base+"[value]",options_for_select(markup_value.collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
   end
 
   def render_text_area 
-    control_group_wrapper{|key,value|text_area_tag(get_field_name_base + (key.nil? ? '' : "[#{key}]"),  value,markup_options)}
-  end
-
-  def render_text_field
-    control_group_wrapper do |key,value|
+     control_group_wrapper do |key,value|
       if(add_more and value.is_a?(Hash))
         values = value
         values.each_with_index.collect  do |value,index|
-          text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"),  value.last,markup_options)
+          text_area_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"),  value.last,@markup_options)
         end.join.html_safe
       else
-      text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}]"),  value,markup_options)
+      value = can_muti_lang_input ?  @prefiled_value[key] : @prefiled_value
+      key = can_muti_lang_input ? "[#{key}]" : "[value]"
+      text_area_tag(get_field_name_base + key,  value,@markup_options)
+      end
+    end
+  end
+
+  def render_text_field
+     control_group_wrapper do |key,value|
+      if(add_more and value.is_a?(Hash))
+        values = value
+        values.each_with_index.collect  do |value,index|
+          text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"),  value.last,@markup_options)
+        end.join.html_safe
+      else
+      value = can_muti_lang_input ?  @prefiled_value[key] : @prefiled_value
+      key = can_muti_lang_input ? "[#{key}]" : "[value]"
+      text_field_tag(get_field_name_base + key,  value,@markup_options)
     end
   end
 end
 protected
   def lang_panel_control_wrapper(&block)
-    result = '<div class="tabbable tabs-right">'
+    result = '<div class="tabbable">'
     result <<   '<div class="tab-content">'
     result <<       controls_wrapper{yield}
     result <<   '</div>'
@@ -99,7 +116,7 @@ protected
   def controls_wrapper(&block)
     result = "<div class='controls'>"
     if can_muti_lang_input
-      result << "<div class='tabbable tabs-right'>"
+      result << "<div class='tabbable'>"
       result << "<div class='tab-content'>"
       VALID_LOCALES.collect do |key|
         value  = @prefiled_value[key.to_s] rescue nil
@@ -108,7 +125,7 @@ protected
         result << content_tag(:div,yield(key,value),:class=>div_class,:id=>"tab"+id.to_s+"_#{key}")
       end
       result << "</div>"
-      result << "<ul class='nav nav-tabs'>"
+      result << "<ul class='nav nav-pills'>"
       VALID_LOCALES.each do |key|
         result << content_tag(:li,link_to(I18n.t("langs."+key),"#tab"+id.to_s+"_#{key}",:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ?  "active" : nil))
       end
@@ -141,9 +158,9 @@ protected
 
   def end_block
     if @new_attribute
-      hidden_field_tag(get_field_name_base+"[attribute_field_id]",id)
+      hidden_field_tag(get_field_name_base+"[attribute_field_id]",id,:for=>"field_#{@index}")
     else
-      hidden_field_tag(get_field_name_base+"[id]",@attribute_value.id)
+      hidden_field_tag(get_field_name_base+"[id]",@attribute_value.id,:for=>"field_#{@index}")
     end
   end