Skip to content

fix issue with display of org links and email #3117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briri merged 5 commits into from
Mar 3, 2022
Merged

fix issue with display of org links and email #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
699e724
fix issue with display of org links and email
briri Feb 25, 2022
60c70fa
added @babel.core to JS dependencies
briri Feb 25, 2022
99ab653
commented out karma tests
briri Feb 25, 2022
ea91d53
ran yarn install
briri Feb 25, 2022
69492e5
Merge branch 'development' into fix-branding-emails-links
briri Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ jobs:
- name: 'Precompile all of the Assets'
run: bin/rails assets:precompile

# briley - comment out Karma tests due to issues with dependencies. We should
# replace these with RSpec feature tests
# Run the JS tests
#- name: 'Run Karma Tests'
# run: yarn test
# - name: 'Run Karma Tests'
# run: yarn test

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ jobs:
- name: 'Compile Assets'
run: bin/rails assets:precompile

# briley - comment out Karma tests due to issues with dependencies. We should
# replace these with RSpec feature tests
# Run the JS tests
#- name: 'Run Karma Tests'
# run: yarn test
# - name: 'Run Karma Tests'
# run: yarn test

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
Expand Down
13 changes: 9 additions & 4 deletions app/views/layouts/_branding.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="org-navbar-menu">
<!-- Organisational links -->
<% if user_signed_in? and !current_user.org.links.nil? and !current_user.org.links['org'].blank? %>
<%
links = current_user.org.links.present? ? current_user.org.links.fetch('org', []) : []
i = 1
%>
<% if user_signed_in? && (links.any? || current_user.org.contact_email.present?) %>
<ul class="nav navbar-nav">
<% i=1; current_user.org.links['org'].each do |link| %>
<% if !link.blank? && i <= max_number_links %>
<% links.each do |link| %>
<% if link.present? && i <= max_number_links %>
<% if i.odd? %>
</li><li class="org-links">
<% end %>
Expand All @@ -35,7 +39,8 @@
<%= link['text'].blank? ? link['link'] : link['text'] %>
<em class="sr-only"> (new window)</em>
<span class="new-window-popup-info"><%= _('Opens in new window') %></span>
<% end; i+=1 %>
<% end %>
<% i += 1 %>
<% end %>
<% end %>
<% if i.odd? %>
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"homepage": "https://github.com/DMPRoadmap/roadmap#readme",
"dependencies": {
"@babel/core": "^7.11.6",
"@rails/actioncable": "^6.0.3-1",
"@rails/activestorage": "^6.0.3-1",
"@rails/ujs": "^6.0.3-1",
Expand Down
Loading