diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb index 601034d..1587ad4 100644 --- a/app/views/layouts/_navigation.html.erb +++ b/app/views/layouts/_navigation.html.erb @@ -14,7 +14,7 @@ <% else %>
  • <% end %> - <%= link_to t("org_admin.template_label"), admin_index_dmptemplate_path(current_user.organisation_id) %> + <%= link_to t("org_admin.template_label"), admin_index_dmptemplate_path(current_user.org_id) %>
  • <% end %> <% if current_user.can_modify_guidance? %> @@ -23,16 +23,16 @@ <% else %>
  • <% end %> - <%= link_to t("org_admin.guidance_label"), admin_index_guidance_path(current_user.organisation_id)%> + <%= link_to t("org_admin.guidance_label"), admin_index_guidance_path(current_user.org_id)%>
  • <% end %> <% if current_user.can_modify_org_details? %> - <% if namespace == "organisations" then %> + <% if namespace == "orgs" then %>
  • <% else %>
  • <% end %> - <%= link_to t("org_admin.org_details_label"), admin_show_organisation_path(current_user.organisation_id)%> + <%= link_to t("org_admin.org_details_label"), admin_show_org_path(current_user.org_id)%>
  • <% end %> <% if current_user.can_grant_permissions? %> diff --git a/app/views/orgs/admin_show.html.erb b/app/views/orgs/admin_show.html.erb index 43fda59..49afc79 100644 --- a/app/views/orgs/admin_show.html.erb +++ b/app/views/orgs/admin_show.html.erb @@ -79,7 +79,7 @@ <%= t('org_admin.last_updated') %> - <%= l @organisation.updated_at.to_date, :formats => :short %> + <%= l @organisation.updated_at.to_date, formats: :short %> @@ -87,7 +87,7 @@
    - <%= link_to t("helpers.submit.edit"), admin_edit_organisation_path(current_user.organisation), :class => 'btn btn-primary'%> + <%= link_to t("helpers.submit.edit"), admin_edit_org_path(current_user.org), class: 'btn btn-primary'%>