Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5

2015-01-12 12:20:52 +05:30 · 2015-01-12 12:20:52 +05:30 · 4fd0e2d315
parent 9be7e13774 3532ec67a9
commit 4fd0e2d315
1 changed files with 3 additions and 3 deletions
--- a/lib/orbit_app/register_module.rb
+++ b/lib/orbit_app/register_module.rb
@ -22,10 +22,10 @@ module OrbitApp
    end

    def check_module_permissions
-      store_token = Site.first.store_token
-      module_apps = ModuleApp.all
-      exceptions = OrbitStore::MODULE_EXCEPTIONS
+      store_token = Site.first.store_token rescue nil
      if !store_token.nil?
+        module_apps = ModuleApp.all
+        exceptions = OrbitStore::MODULE_EXCEPTIONS
        ids = []
        module_index = {}
        module_apps.each do |ma|