Merge 521d2dc72f into b64cc9f7e4

app/views/admin/events/index.html.haml

@@ -13,7 +13,7 @@
             %b ID
           %th
             %b Title
-          - if @conference.call_for_papers.rating != 0
+          - if !@conference.call_for_papers.blank? && @conference.call_for_papers.rating != 0
             %th
               %b Rating
           %th

app/views/admin/users/index.html.haml

@@ -24,6 +24,7 @@
               %b Roles
             %th
             %th
+            %th
           - @users.each do |user|
             - person = Person.find_person_by_user_id(user.id)
             %tr
@@ -71,6 +72,12 @@
                   "data-html" => "true",
                   "data-content" => user.popup_details,
                   "data-original-title" => ""
+              
+              %td
+                - if current_user.id == user.id or user.role_ids.include? 3
+                  =link_to 'Delete',admin_user_path(user), :method => :delete , :data => {:confirm => 'Are you sure ?'}, :disabled => true,:class => "btn btn-primary disabled btn-danger",:role => "button" 
+                - else 
+                  =link_to 'Delete',admin_user_path(user), :method=> :delete , :data=> {:confirm => 'Are you sure ?'},:class => "btn btn-primary btn-danger"
 
 :javascript
   $(document).ready(function() {