updated rails to 4.2.4

2015-09-17 12:12:51 +02:00 · 2015-09-17 12:12:51 +02:00 · 42e8bb11ea
commit 42e8bb11ea
parent 37697517df
55 changed files with 766 additions and 365 deletions
--- a/app/views/layouts/_admin_sidebar.html.haml
+++ b/app/views/layouts/_admin_sidebar.html.haml
@ -29,9 +29,14 @@
        Dashboard
  - if can? :show, @conference
    %li{:class=> "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"}
-      = link_to(edit_admin_conference_path(@conference.short_title)) do
-        %span.fa.fa-home
-        Basics
+      - if can? :edit, @conference
+        = link_to(edit_admin_conference_path(@conference.short_title)) do
+          %span.fa.fa-home
+          Basics
+      - else
+        %a
+          %span.fa.fa-home
+          Basics
      %ul
        - if can? :update, Contact.new(conference_id: @conference.id)
          %li{:class=> "#{active_nav_li(edit_admin_conference_contact_path(@conference.short_title))}"}