Skip to content

Commit

Permalink
Merge branch 'dev' into 277_4.11_renamePrintButton
Browse files Browse the repository at this point in the history
  • Loading branch information
Blaidd-Drwg committed Jan 21, 2017
2 parents 6b9c240 + 8d9d5c2 commit 87ab9dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 4 additions & 0 deletions app/views/events/_show_event_large.html.erb
@@ -1,6 +1,10 @@
<%- model_class = Event -%>
<div>
<div class="pull-right">
<% if can? :view_participants, Event %>
<%= link_to t('events.participants.show_participants'),
event_path(@event) + "/participants" , :class => 'btn btn-default btn-sm' %>
<% end %>
<%= link_to t("helpers.links.apply"), new_application_letter_path(:event_id => @event.id), class: "btn btn-success btn-sm" %>
<%= link_to t('.edit', :default => t('helpers.links.edit')), edit_event_path(@event),
:class => 'btn btn-default btn-sm' if can? :edit, @event %>
Expand Down
4 changes: 0 additions & 4 deletions app/views/events/show.html.erb
Expand Up @@ -19,7 +19,3 @@
<%= link_to t('.back', :default => t('helpers.links.back')),
events_path, :class => 'btn btn-default' %>
<% if can? :view_participants, Event %>
<%= link_to t('events.participants.show_participants'),
event_path(@event) + "/participants" , :class => 'btn btn-default' %>
<% end %>

0 comments on commit 87ab9dd

Please sign in to comment.