From d13c1a83e49ceda1d98db70a397e933a63f35466 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Tue, 12 Aug 2014 16:33:01 +0300 Subject: [PATCH] fix in questions --- app/models/ability.rb | 1 + app/views/admin/questions/_questions.html.haml | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 98bb265e..8f3b262c 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -79,6 +79,7 @@ class Ability can :index, Venue, id: venue_ids_for_cfp can :manage, Registration, conference_id: conf_ids_for_organizer + conf_ids_for_info_desk can :manage, Question, conference_id: conf_ids_for_organizer + conf_ids_for_info_desk + cannot [:edit, :update, :destroy], Question, global: true can :manage, Vposition, conference_id: conf_ids_for_organizer + conf_ids_for_volunteer_coordinator can :manage, Vday, conference_id: conf_ids_for_organizer + conf_ids_for_volunteer_coordinator # The ability to manage an Event means that: diff --git a/app/views/admin/questions/_questions.html.haml b/app/views/admin/questions/_questions.html.haml index 46da49cd..145261e3 100644 --- a/app/views/admin/questions/_questions.html.haml +++ b/app/views/admin/questions/_questions.html.haml @@ -18,11 +18,9 @@ = ',' = label_tag dom_id(q), "Answers: #{q.answers.map {|a| a.title}.join(', ')}" - - if can? :update, q - %td= link_to 'Edit', edit_admin_conference_question_path(@conference.short_title, q), - class: 'btn btn-primary', disabled: q.global == true + %td= link_to 'Edit', edit_admin_conference_question_path(@conference.short_title, q), + class: 'btn btn-primary', disabled: !(can? :update, q) - - if can? :destroy, q - %td= link_to 'Delete', admin_conference_question_path(@conference.short_title, q), - method: :delete, remote: true, class: 'btn btn-danger', - confirm: "Delete question '#{q.title}'?", disabled: q.global == true + %td= link_to 'Delete', admin_conference_question_path(@conference.short_title, q), + method: :delete, remote: true, class: 'btn btn-danger', + confirm: "Delete question '#{q.title}'?", disabled: !(can? :destroy, q)