Skip to content

Commit

Permalink
Fix problems for beta test
Browse files Browse the repository at this point in the history
Changes include:

+ Fix 500 error when downloading monthly reports
+ Remove guidance from admin drop down menu
+ Reword message on create template view
  • Loading branch information
lagoan committed Jul 8, 2020
1 parent 1fc53e1 commit 30364c6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
9 changes: 9 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# For some reason ignoring tmp creates a problem when compiling assets
# tmp
# !tmp/pids/.keep
log
coverage/

.dockerignore
docker-compose-development.yml
docker-compose.yml
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ruby:2.5.8

# Dependancies
RUN apt-get update -qq && \
apt-get install -y \
apt-get install --no-install-recommends -y \
build-essential \
git \
libgmp3-dev \
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.production
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

# Dependancies
RUN apt-get update -qq && \
apt-get install -y \
build-essential \
git \
libgmp3-dev \
libpq-dev \
apt-get install --no-install-recommends -y \
# build-essential \
# git \
# libgmp3-dev \
# libpq-dev \
default-mysql-client \
gettext \
nodejs \
Expand Down
3 changes: 3 additions & 0 deletions app/views/layouts/_branding.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,14 @@
<%= link_to _('Templates'), template_path %>
</li>
<% end %>
<!-- GUIDANCE -->
<!--
<% if current_user.can_modify_guidance? %>
<li <%= 'class=active' if active_page?(admin_index_guidance_path(current_user.org_id)) %>>
<%= link_to _('Guidance'), admin_index_guidance_path(current_user.org_id) %>
</li>
<% end %>
-->
<% if current_user.can_super_admin? %>
<li <%= 'class=active' if active_page?(admin_edit_org_path(current_user.org_id)) %>>
<%= link_to _('Organisations'), super_admin_orgs_path %>
Expand Down
2 changes: 1 addition & 1 deletion config/locale/en_CA/app.po
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ msgid "If you have any questions, please contact the %{application_name} team at
msgstr ""

msgid "If you wish to add an organisational template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organisation when no funder templates apply. If you want to add questions to funder templates use the 'customise template' options below."
msgstr "If you wish to add an organizational template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organization when no funder templates apply. If you want to add questions to funder templates use the 'customize template' options below."
msgstr "If you wish to add an organizational template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organization. If you want to add questions to Portage Data Curation Template use the 'customize template' options below."

msgid "If you would like to change your password please complete the following fields."
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion config/locale/en_US/app.po
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ msgid "If you have any questions, please contact the %{application_name} team at
msgstr ""

msgid "If you wish to add an organisational template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organisation when no funder templates apply. If you want to add questions to funder templates use the 'customise template' options below."
msgstr "If you wish to add an organizational template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organization when no funder templates apply. If you want to add questions to funder templates use the 'customize template' options below."
msgstr "If you wish to add an organizational template for a Data Management Plan, use the 'create template' button. You can create more than one template if desired e.g. one for researchers and one for PhD students. Your template will be presented to users within your organization. If you want to add questions to Portage Data Curation Template use the 'customize template' options below. "

msgid "If you would like to change your password please complete the following fields."
msgstr ""
Expand Down

0 comments on commit 30364c6

Please sign in to comment.