From cd86433abf519ff30e3e9699a5abac32d2eee122 Mon Sep 17 00:00:00 2001 From: manson Date: Tue, 20 May 2014 12:14:52 +0800 Subject: [PATCH] rescue nil for site in_use_locales --- .../admin/module_store_controller.rb | 7 + app/controllers/admin/sites_controller.rb | 4 +- app/views/admin/module_store/index.html.erb | 231 ++++++++++++++++++ app/views/admin/sites/site_info.html.erb | 2 +- 4 files changed, 242 insertions(+), 2 deletions(-) create mode 100644 app/controllers/admin/module_store_controller.rb create mode 100644 app/views/admin/module_store/index.html.erb diff --git a/app/controllers/admin/module_store_controller.rb b/app/controllers/admin/module_store_controller.rb new file mode 100644 index 0000000..10422e3 --- /dev/null +++ b/app/controllers/admin/module_store_controller.rb @@ -0,0 +1,7 @@ +class Admin::ModuleStoreController < OrbitAdminController + layout "structure" + + def index + @extensions = [] + end +end \ No newline at end of file diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index eb1ba1f..68ff39e 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -116,7 +116,9 @@ class Admin::SitesController < OrbitAdminController # Site.update_all({:default_locale => nil}) # end - params[:site][:in_use_locales] = params[:site][:in_use_locales].map{|locale| locale.to_sym} + unless params[:site][:in_use_locales].nil? + params[:site][:in_use_locales] = params[:site][:in_use_locales].map{|locale| locale.to_sym} + end if params[:site][:phone_number].nil? params[:site][:phone_number] = [] diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb new file mode 100644 index 0000000..714d0b7 --- /dev/null +++ b/app/views/admin/module_store/index.html.erb @@ -0,0 +1,231 @@ + + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/main-list"%> + <%= stylesheet_link_tag "lib/mt-list"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/togglebox"%> + + <%= javascript_include_tag 'lib/footable-0.1' %> + <%= javascript_include_tag 'lib/all-list' %> + <%= javascript_include_tag 'lib/retina' %> + + + +<%= flash[:notice] rescue nil%> +
+
+


+
+ <%= image_tag("preloader.gif", size: "50") %> +
+
+ +
+
+
+
+

Are you sure?

+ Delete module +
+
+ + +
+
+
+ +
+ +
+
+
<%= t(:installed_modules) %>
+
+ + + +
+
+
+ +
+
+
+ +
+
+
<%= t(:module_store) %>
+
+ <% if @extensions.empty? %> + <% if @store_confirmation %> + <%#= render :partial => "admin/site_registration/site_registration" %> + <% else %> + <%#= render :partial => "admin/site_registration/not_confirmed_store" %> + <% end %> + <% else %> + + + + + + + + + + <% @extensions.each do |extension|%> + + + + <% @module_installed = File.read("downloaded_extensions.rb").include?(extension["key"])%> + <% if @module_installed.eql?(true)%> + + <% else %> + + <% end %> + + <% end %> + +
Module TitleDescriptionActive
+
+ +
+
<%=link_to extension["title"], admin_module_store_show_path(:id => extension["_slugs"][0])%>
+

<%=extension["author"]%>

+ 		+ <%= extension["description"].html_safe%> <%=link_to extension["title"], admin_module_store_show_path(:id => extension["_slugs"][0])%> + Installed<%= link_to t(:install), admin_module_store_download_path(:id => extension["_slugs"][0]), :class=>"act btn btn-success" %>
+ <% end %> +
+
+
+
+
+
+
+ + diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index c64b023..ce9d6f9 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -18,7 +18,7 @@
Language