Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

lib/parsers/parser_common.rb

@@ -210,7 +210,7 @@ module ParserCommon
                 when 'default_widget'
                     "/panel/orbit_app/widget/#{part.widget_style}?inner=true"
                   else
-                    "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
+                    "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true&widget_options=#{part.widget_options_uri}"
                 end
           options = "&part_id=#{part.id}&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}"
           ret << "<div class='dymanic_load widget' path='#{url + options}'></div>"

lib/parsers/parser_front_end.rb

@@ -114,9 +114,8 @@ module ParserFrontEnd
                     when 'default_widget'
                         "/panel/orbit_app/widget/\#{part.widget_style}?inner=true"
                       else
-                        "/panel/\#{part.module_app.key}/widget/\#{part.widget_path}?inner=true"
+                        "/panel/\#{part.module_app.key}/widget/\#{part.widget_path}?inner=true&widget_options=\#{part.widget_options_uri}"
                     end
-          
           options = "&part_id=\#{part.id}&category_id=\#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=\#{!part[:tag].blank? ? part[:tag] : tag}&page=\#{params[:page]}&search_query=\#{params[:search_query]}&part_title=\#{Rack::Utils.escape(part_title).gsub(\"\+\", \"\%20\") rescue nil}"
           ret << "<orbit_front path='#{url + options}' part_id=#{part.id} class='dymanic_load widget'></orbit_front>"
           

lib/tasks/migrate.rake

@@ -319,4 +319,13 @@ namespace :migrate do
     end
   end
 
+
+  task :add_widget_options_to_gallery => :environment do
+      a = ModuleApp.where(:key=>'gallery').first
+      a.widget_options = {"widget1"=>{"vertical"=>[1, 2], "horizontal"=>[1, 2, 3, 4, 5, 6]}}
+      a.widget_options_fields_i18n = {"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal"}}
+      a.save
+    
+  end
+
 end