diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index eb9c299..acb8485 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -119,6 +119,7 @@ class Admin::SitesController < OrbitAdminController def bundle_install Bundler.with_clean_env { `cd #{Rails.root} && BUNDLE_GEMFILE=built_in_extensions.rb bundle update && bundle` } + Bundler.with_clean_env { `cd #{Rails.root} && BUNDLE_GEMFILE=downloaded_extensions.rb bundle update && bundle` } %x(kill -s USR2 `cat tmp/pids/unicorn.pid`) sleep 5 render :nothing => true diff --git a/app/views/admin/sites/update_manager.erb b/app/views/admin/sites/update_manager.erb index d76e3ff..8df58bc 100644 --- a/app/views/admin/sites/update_manager.erb +++ b/app/views/admin/sites/update_manager.erb @@ -127,7 +127,7 @@ <% if @store_permissions["permission_granted"] %> - + <% else %> Please register here. <% end %> @@ -173,6 +173,9 @@
+ <% if @store_permissions["permission_granted"] %> + + <% end %>
diff --git a/lib/orbit_app/register_module.rb b/lib/orbit_app/register_module.rb index ad019fd..ad9b2da 100644 --- a/lib/orbit_app/register_module.rb +++ b/lib/orbit_app/register_module.rb @@ -41,11 +41,18 @@ module OrbitApp if !response.nil? data = JSON.parse(response.body) if response.code == "200" - permissions = data["permissions"] - permissions.each do |permission| - ma = module_index[permission["app"]] - ma.store_permission_granted = (exceptions.include?(ma.key) ? true : permission["granted"]) - ma.save + if data["success"] + permissions = data["permissions"] + permissions.each do |permission| + ma = module_index[permission["app"]] + ma.store_permission_granted = (exceptions.include?(ma.key) ? true : permission["granted"]) + ma.save + end + else + module_apps.each do |ma| + ma.store_permission_granted = (exceptions.include?(ma.key) ? true : false) + ma.save + end end end else