Merge 22e0c1d8f8 into 05209260a4

2017-03-10 16:41:42 +00:00 · 2017-03-10 16:41:42 +00:00 · 92abf4b2ff
commit 92abf4b2ff
parent 05209260a4 22e0c1d8f8
8 changed files with 283 additions and 5 deletions
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@ -4,7 +4,10 @@
      %h1
        Events
        = "(#{@events.length})" if @events.any?
-        .btn-group.pull-right
+
+        .pull-right
+          - if can? :create, Event
+            =link_to 'Add Event', new_admin_conference_program_event_path(@conference.short_title), :class => 'button btn btn-default btn-info'
          - if can? :read, Event
            .btn-group
              %button.btn.btn-default.dropdown-toggle{"data-toggle" => "dropdown", :type => "button", :class => 'btn btn-success'}