padma-assets 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 910cca1e3aaa699237b11ecb64da1e98e70d034f
-  data.tar.gz: d6731fecf11432fb7d4d88e5754a9966e746c135
+  metadata.gz: 05b65bbe9d792c95ad1dc4c08f0533158d05b75d
+  data.tar.gz: bf851481a0c2d2f198337758c59ed2e407c94c2d
 SHA512:
-  metadata.gz: c856e8f7a878efde7d70799e1253a4502c04db2e6f360d5b0f927679bfe74b479c59f2d3ec5c2240d3fd2e3a2c41b6bb8654a7dda71c9a4e82e756069bafb357
-  data.tar.gz: a984528bae390a168a2d267db09c44fd9156c3b0bf6f2792953119fdf4a25f6b0a7e0e033c9710edef65e464a577c73f46c4516947ab93292b6c67271a7f241c
+  metadata.gz: b1d9b9d9b1f25167ae5663a9596b4ed7ff81950938d52f40fa7fda2ae95c209e612bbed7d1467a03e7b45b7ff65cc88084c84497b90a0034c10245ea26c4789e
+  data.tar.gz: 195d0ddff2d9653593c55a2a916ab34c5b0f19addb980ff301cfd77d54cdc46701d5284177b430e6a6932b638827ece27af9e8895d268774fe1af7db648f8440

data/app/abilities/general_ability.rb

@@ -18,11 +18,13 @@ class GeneralAbility
   private
 
   def in_country?(user,country_name)
-    name = user.current_account.name
-    @country = Rails.cache.fetch("countryfor#{name}") do
-      user.current_account.padma.country
+    name = user.current_account.try(:name)
+    if name
+      @country = Rails.cache.fetch("countryfor#{name}") do
+        user.current_account.padma.country
+      end
+      @country == country_name
     end
-    @country == country_name
   end
   
   def alpha?(user)

data/app/views/layouts/_module_box.html.erb

@@ -46,7 +46,7 @@
             <%= t('header-menu.modules.title') %> <span class="caret"></span>
           </a>
           <ul class="dropdown-menu" role="menu">
-            <li><%= link_to t('header-menu.modules.fnz'), APP_CONFIG['fnz-url'] %></li>
+            <li><%= link_to t('header-menu.modules.fnz'), APP_CONFIG['fnz-url'], target: '_blank' %></li>
             <% if can?(:manage,:planning) -%>
               <li><%= link_to t('header-menu.modules.planning'), APP_CONFIG['planning-url'] %></li>
             <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padma-assets
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dwayne Macgowan
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: accounts_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.22
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.22
 description: Assets to be re-used in PADMA applications
 email:
 - dwaynemac@gmail.com