bhf 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8936098b54f85786ebe73f7845dbbf32599f91
-  data.tar.gz: a832898bc53668d2ef8436935216d718922c8599
+  metadata.gz: 5e0475a112da2bc9c100d4cc1b0a1f9b527fdf0c
+  data.tar.gz: 21ca51559e2e6ac049cd724cb9cfc62a63ca4f8c
 SHA512:
-  metadata.gz: 438ca47d909e1eadaa7d04db9cf69fac50791fbda2c04f0a136545772899704b532c5d9e353637c27e3b69f201c1913c71b75125aac49413164459a4e45c4fbb
-  data.tar.gz: 38f24801dddb881ab71c14d8e4f5630675e645f3917ead4e3f0cb27f64578bf541f50d985da4fbee66a280f8057ec6e63d75171112d2ec72ce088469297b943e
+  metadata.gz: 26b56084f35c1bfae5d652327605e68d7e510e437d6579023a47a4d496e4f879cf177fc37ea7dfe50a09373b17a7458181b9d3eb10827774997b18a89d8e755c
+  data.tar.gz: 13d9ae98339dbe368d419457da568c45fcb549b5bb269ca96513410618f90c59da224d9b69d567b77de42b2921d7f17d2feb02ba04ce414744a9b97e34544f53

data/app/controllers/bhf/application_controller.rb

@@ -40,14 +40,14 @@ class Bhf::ApplicationController < ActionController::Base
         if current_account.respond_to?(:area_role)
           return current_account.area_role(area)
         elsif current_account.respond_to?(:area_roles)
-          return current_account.area_roles(area).collect(&:to_bhf_s)
+          return current_account.area_roles(area).collect(&:identifier)
         end
       end
 
       if current_account.respond_to?(:role)
-        current_account.role.is_a?(String) ? current_account.role : current_account.role.to_bhf_s
+        current_account.role.is_a?(String) ? current_account.role : current_account.role.identifier
       elsif current_account.respond_to?(:roles)
-        current_account.roles.collect(&:to_bhf_s)
+        current_account.roles.collect(&:identifier)
       end
     end
 
@@ -80,11 +80,13 @@ class Bhf::ApplicationController < ActionController::Base
       @areas = []
       if current_account and current_account.respond_to?(:bhf_areas)
         current_account.bhf_areas.each do |area|
+          selected = params[:bhf_area] == area.identifier
           @areas << OpenStruct.new(
-            name: t("bhf.areas.links.#{area.to_bhf_s}", default: area.to_bhf_s),
-            selected: params[:bhf_area] == area.to_bhf_s,
-            path: main_app.bhf_path(area.to_bhf_s)
+            name: area.to_bhf_s,
+            selected: selected,
+            path: main_app.bhf_path(area.identifier)
           )
+          @root_link = area.link if selected
         end
       end
     end

data/app/views/layouts/bhf/application.haml

@@ -15,7 +15,7 @@
         - else
           - Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
         
-        = link_to image_tag(logo), main_app.root_url, :'data-no-turbolink' => true
+        = link_to image_tag(logo), @root_link ? @root_link : main_app.root_url, :'data-no-turbolink' => true
 
       - if @areas and @areas.length > 1
         = select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area])), class: 'icon'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails