From 343294858e505a26c5ca0cbcd518904386c7ab07 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 31 Dec 2014 15:27:18 +0800
Subject: [PATCH] fix for non registered site and module update button

---
 app/controllers/admin/sites_controller.rb |  1 +
 app/views/admin/sites/update_manager.erb  |  5 ++++-
 lib/orbit_app/register_module.rb          | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

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"] %>
 					<button id="update_btn" class="btn btn-primary pull-right"  style="margin: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.system_update") %></button>
 
-					<button id="module_update_btn" class="btn btn-primary pull-right"  style="margin: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.module_update") %></button>
+					<button id="module_update_btn" class="btn btn-primary pull-right"  style="margin-right: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.module_update") %></button>
 				<% else %>
 					<a href="/<%= I18n.locale.to_s  %>/admin/designs" class="pull-right">Please register here.</a>
 				<% end %>
@@ -173,6 +173,9 @@
 				</div>
 				<div style="padding: 10px 0; height: 65px;">
 					<button id="chech_update_btn" class="btn btn-small btn-inverse pull-right"><i class="icon-refresh icon-white"></i> <%= t("update_manager_.check_update") %></button>
+					<% if @store_permissions["permission_granted"] %>
+						<button id="module_update_btn" class="btn btn-primary btn-small pull-right"  style="margin-right: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.module_update") %></button>
+					<% end %>
 				</div>
 			</div>
 		</div>
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