From 83abc9f71f1f857ceab691dfea6b2664baaea847 Mon Sep 17 00:00:00 2001 From: shlok007 Date: Wed, 9 Aug 2017 23:34:58 +0530 Subject: [PATCH] remove Organization suffix from navbar-brand in navigation --- app/views/layouts/_navigation.html.haml | 2 +- spec/features/conference_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 193e6b76..9750be92 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -10,7 +10,7 @@ - if conference.nil? || conference.new_record? = link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager' - else - = link_to "#{conference.organization.name} Organization", organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager' + = link_to conference.organization.name, organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager' .collapse.navbar-collapse - if content_for :splash_nav %ul.nav.navbar-nav#splash-nav diff --git a/spec/features/conference_spec.rb b/spec/features/conference_spec.rb index 5ac9f29b..f3205e07 100644 --- a/spec/features/conference_spec.rb +++ b/spec/features/conference_spec.rb @@ -77,7 +77,7 @@ feature Conference do sign_in user visit admin_conference_path(conference.short_title) - expect(find('.navbar-brand').text).to eq "#{conference.organization.name} Organization" + expect(find('.navbar-brand').text).to eq(conference.organization.name) end it_behaves_like 'add and update conference'