dm_event 4.2.1.5 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d8fe1df77a2f9988b3e542ff630ada442a532a
-  data.tar.gz: 1d024244f2d63c430d5842e817946a35033d40b9
+  metadata.gz: dea6ef511efd6db0aee3ce60595983c05a8ed4b1
+  data.tar.gz: ea0c6813860edba83743ff1798ff539401b888b4
 SHA512:
-  metadata.gz: d37f34b6cbdf20ef53dbe02ed83bbd396deaf3f64f11bcdbff58647874a225c1d990d5e8fe1f10711c3b984da800dff77b900c021ca8b86d4eb689ddb96eca3b
-  data.tar.gz: 00866053024886b52c3d7e548c05735330d56a7724af7eeb1e3f90f5609f90d332d68a01007fabd95bcf26206ab6af9305c32f1d1d0b2150b18398528038a292
+  metadata.gz: 308fbd246363d28dbbbc6ae94c82d3ad0e0c0a43b8b685d70b749487bef03033bc49198e06230c702a62aea724de37a3fcbd6b3633420f9e200175456f783e81
+  data.tar.gz: 495774ef45baee7b4a6dfdb98da51b9ee1ab2d0dedeb0bbe96079d42813a4046985778a16ad18b131aa365cea7ec01d918449d4f0367e098efd3f68b7bd6c376

data/app/controllers/dm_event/admin/admin_controller.rb

@@ -5,7 +5,7 @@ protected
 
   #------------------------------------------------------------------------------
   def authorize_access
-    unless can?(:manage_events, :all)
+    unless can?(:access_event_section, :all)
       flash[:alert] = "Unauthorized Access!"
       redirect_to current_account.index_path 
     end

data/app/controllers/dm_event/admin/registrations_controller.rb

@@ -6,6 +6,8 @@ class DmEvent::Admin::RegistrationsController < DmEvent::Admin::AdminController
   #------------------------------------------------------------------------------
   def action_state
     @registration = Registration.find(params[:id])
+    authorize! :manage_event_registrations, @registration.workshop
+
     @state_event  = params[:state_event].downcase
     case @state_event
     # when 'verify payment'
@@ -32,6 +34,7 @@ class DmEvent::Admin::RegistrationsController < DmEvent::Admin::AdminController
   #------------------------------------------------------------------------------
   def destroy
     registration = Registration.find(params[:id])
+    authorize! :manage_event_registrations, registration.workshop
     registration.destroy
     redirect_to admin_workshop_url(registration.workshop), notice: 'Registration was successfully deleted.'
   end
@@ -40,16 +43,18 @@ class DmEvent::Admin::RegistrationsController < DmEvent::Admin::AdminController
   def edit
     @registration = Registration.find(params[:id])
     @workshop     = @registration.workshop
+    authorize! :manage_event_registrations, @registration.workshop
   end
 
   #------------------------------------------------------------------------------
   def update
     @registration = Registration.find(params[:id])
     @workshop     = @registration.workshop
+    authorize! :manage_event_registrations, @registration.workshop
 
     #--- save without validation, so can update without having to fill in all details
     payment_comment_text      = params[:registration].delete(:payment_comment_text)
-    @registration.attributes  = registration_params
+    @registration.attributes  = registration_params(@workshop)
 
     if @registration.save(:validate => false)
       if @registration.payment_comment.nil? && payment_comment_text
@@ -70,6 +75,8 @@ class DmEvent::Admin::RegistrationsController < DmEvent::Admin::AdminController
   def ajax_payment
     @registration     = Registration.find(params[:id])
     @workshop         = @registration.workshop
+    authorize! :manage_event_registrations, @registration.workshop
+
     previous_payment  = params[:payment_id] ? PaymentHistory.find(params[:payment_id]) : nil
     @payment_history  = @registration.manual_payment(previous_payment,
                               params[:payment_history][:cost],
@@ -98,6 +105,8 @@ class DmEvent::Admin::RegistrationsController < DmEvent::Admin::AdminController
   #------------------------------------------------------------------------------
   def ajax_delete_payment
     @registration     = Registration.find(params[:id])
+    authorize! :manage_event_registrations, @registration.workshop
+
     if @registration.delete_payment(params[:payment_id])
       redirect_to edit_admin_registration_path(@registration), notice: 'Payment was deleted'
     else

data/app/controllers/dm_event/admin/workshop_prices_controller.rb

@@ -6,20 +6,24 @@ class DmEvent::Admin::WorkshopPricesController < DmEvent::Admin::AdminController
   
   #------------------------------------------------------------------------------
   def index
+    authorize! :manage_events, @workshop
     @workshop_prices  = @workshop.workshop_prices
   end
 
   #------------------------------------------------------------------------------
   def new
+    authorize! :manage_events, @workshop
     @workshop_price = @workshop.workshop_prices.build(price_currency: @workshop.base_currency)
   end
 
   #------------------------------------------------------------------------------
   def edit
+    authorize! :manage_events, @workshop
   end
 
   #------------------------------------------------------------------------------
   def create
+    authorize! :manage_events, @workshop
     attributes = WorkshopPrice.prepare_prices(workshop_price_params.merge(price_currency: @workshop.base_currency))
     @workshop_price = @workshop.workshop_prices.new(attributes)
     if @workshop_price.save
@@ -31,6 +35,7 @@ class DmEvent::Admin::WorkshopPricesController < DmEvent::Admin::AdminController
 
   #------------------------------------------------------------------------------
   def update
+    authorize! :manage_events, @workshop
     attributes = WorkshopPrice.prepare_prices(workshop_price_params.merge(price_currency: @workshop.base_currency))
     if @workshop_price.update_attributes(attributes)
       redirect_to admin_workshop_workshop_prices_url(@workshop), notice: 'Price was successfully updated.'
@@ -41,6 +46,7 @@ class DmEvent::Admin::WorkshopPricesController < DmEvent::Admin::AdminController
 
   #------------------------------------------------------------------------------
   def destroy
+    authorize! :manage_events, @workshop
     if @workshop_price.registrations.count == 0
       @workshop_price.destroy
       redirect_to admin_workshop_workshop_prices_url(@workshop), notice: 'Price was successfully deleted.'

data/app/controllers/dm_event/admin/workshops_controller.rb

@@ -9,21 +9,25 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
 
   #------------------------------------------------------------------------------
   def index
-    @workshops      = Workshop.upcoming
-    @workshops_past = Workshop.past
+    authorize! :access_event_section, :all
+    @workshops      = Workshop.upcoming.select {|w| can?(:list_events, w)}
+    @workshops_past = Workshop.past.select {|w| can?(:list_events, w)}
   end
 
   #------------------------------------------------------------------------------
   def new
+    authorize! :manage_events, :all
     @workshop = Workshop.new
   end
 
   #------------------------------------------------------------------------------
   def edit
+    authorize! :manage_events, @workshop
   end
 
   #------------------------------------------------------------------------------
   def create
+    authorize! :manage_events, :all
     @workshop = Workshop.new(workshop_params)
     if @workshop.save
       redirect_to admin_workshop_url(@workshop), notice: 'Workshop was successfully created.'
@@ -34,6 +38,7 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
 
   #------------------------------------------------------------------------------
   def update
+    authorize! :manage_events, @workshop
     if @workshop.update_attributes(workshop_params)
       redirect_to admin_workshop_url(@workshop), notice: 'Workshop was successfully updated.'
     else
@@ -43,18 +48,25 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
 
   #------------------------------------------------------------------------------
   def show
-    @registrations  = @workshop.registrations
-    
+    authorize! :list_events, @workshop
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: RegistrationDatatable.new(view_context) }
-      format.xls { data_export(Registration.csv_columns(@workshop), @registrations, filename: @workshop.slug, expressions: true, format: 'xls') }
-      format.csv { data_export(Registration.csv_columns(@workshop), @registrations, filename: @workshop.slug, expressions: true, format: 'csv') }
-    end    
+      format.json { 
+        permissions = {
+          manage_events: can?(:manage_events, @workshop),
+          manage_event_registrations: can?(:manage_event_registrations, @workshop),
+          manage_event_finances: can?(:manage_event_finances, @workshop)
+        }
+        render json: RegistrationDatatable.new(view_context, current_user, permissions)
+      }
+      format.xls  { data_export(Registration.csv_columns(@workshop), @workshop.registrations, filename: @workshop.slug, expressions: true, format: 'xls') if can?(:manage_event_registrations, @workshop)}
+      format.csv  { data_export(Registration.csv_columns(@workshop), @workshop.registrations, filename: @workshop.slug, expressions: true, format: 'csv') if can?(:manage_event_registrations, @workshop)}
+    end
   end
 
   #------------------------------------------------------------------------------
   def destroy
+    authorize! :manage_events, :all
     @workshop.destroy
     redirect_to admin_workshops_url, notice: 'Workshop was successfully deleted.'
   end
@@ -63,6 +75,7 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
   # to determine which one we're editing
   #------------------------------------------------------------------------------
   def edit_system_email
+    authorize! :manage_events, @workshop
     redirect_to(admin_workshop_url(@workshop), error: 'Invalid system email type') if params[:email_type].blank?
     # [todo] verify that the email_type is one of the Registration.aasm.states
     
@@ -78,13 +91,15 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
   
   #------------------------------------------------------------------------------
   def financials
+    authorize! :manage_event_finances, @workshop
     @financials = @workshop.financial_details
     @payments = PaymentHistory.where(owner_type: 'Registration', owner_id: @workshop.registrations.pluck(:id)).includes(:user_profile, owner: [:user_profile])
   end
 
-  # Generate a list of all outstanding balances
+  # Generate a list of all outstanding balances across all workshops
   #------------------------------------------------------------------------------
   def user_outstanding_balances
+    authorize! :manage_events, :all
     @unpaid = Registration.unpaid.includes(:user_profile, :workshop_price)
     @unpaid = @unpaid.to_a.delete_if {|i| i.balance_owed.zero?}.group_by {|i| i.full_name}.sort_by {|i| i[0].downcase}
   end
@@ -92,6 +107,7 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
   # Handle any additional configuration, such as selecting the attached blog/forum
   #------------------------------------------------------------------------------
   def additional_configuration
+    authorize! :manage_events, @workshop
     if put_or_post?
       if @workshop.valid?
         new_blog_id = params[:workshop].delete(:cms_blog).to_i
@@ -119,6 +135,7 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
   
   #------------------------------------------------------------------------------
   def send_payment_reminder_emails
+    authorize! :manage_event_finances, @workshop
     status  = @workshop.send_payment_reminder_emails(params[:registration_id])
     msg     = "Reminder emails sent ==>  Success: #{status[:success]}  Failed: #{status[:failed]}"
     status[:failed] > 0 ? (flash[:warning] = msg) : (flash[:notice] = msg)
@@ -127,6 +144,7 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
 
   #------------------------------------------------------------------------------
   def lost_users
+    authorize! :manage_event_registrations, @workshop
     if put_or_post?
       @days_ago = params[:lost_users][:days_ago].to_i
       @days_ago = 60 if @days_ago > 60
@@ -137,6 +155,37 @@ class DmEvent::Admin::WorkshopsController < DmEvent::Admin::AdminController
     @lost_users = @workshop.lost_users(@days_ago)
   end
 
+  #------------------------------------------------------------------------------
+  def permissions
+    authorize! :manage_events, :all
+    if put_or_post?
+      if params[:user][:user_id]
+        user = User.find(params[:user][:user_id])
+        if user
+          roles = params[:user].delete(:roles)
+          [:manage_event, :manage_event_registration, :manage_event_finance].each do |role|
+            roles[role].as_boolean ? user.add_role(role, @workshop) : user.remove_role(role, @workshop)
+          end
+          user.save!
+        end
+      end
+    end
+    @event_managers = User.with_role(:event_manager)
+    @event_managers_alacarte = User.with_role(:event_manager_alacarte)
+  end
+
+  #------------------------------------------------------------------------------
+  def ajax_toggle_permission
+    authorize! :manage_events, :all
+    user = User.find(params[:user_id])
+    role = params[:role].to_sym
+    if user && [:manage_event, :manage_event_registration, :manage_event_finance].include?(role)
+      user.has_role?(role, @workshop) ? user.remove_role(role, @workshop) : user.add_role(role, @workshop)
+      user.save!
+    end
+    render nothing: true
+  end
+
 private
 
   #------------------------------------------------------------------------------

data/app/controllers/dm_event/registrations_controller.rb

@@ -42,7 +42,7 @@ class DmEvent::RegistrationsController < DmEvent::ApplicationController
     profile_params                  = params[:registration].delete("user_profile_attributes") if params[:registration]
     profile_params.delete(:id)      if profile_params
     
-    @registration                   = @workshop.registrations.new(registration_params)
+    @registration                   = @workshop.registrations.new(registration_params(@workshop))
     @registration.registered_locale = I18n.locale
     @registration.user_profile      = current_user ? current_user.user_profile : UserProfile.new
     @registration.user_profile.assign_attributes(user_profile_direct_params(profile_params)) unless profile_params.blank?

data/app/datatables/registration_datatable.rb

@@ -8,8 +8,10 @@ class RegistrationDatatable
   delegate :url_helpers, to: 'DmEvent::Engine.routes'
   
   #------------------------------------------------------------------------------
-  def initialize(view)
+  def initialize(view, user, permissions)
     @view = view
+    @user = user
+    @permissions = permissions
   end
 
   #------------------------------------------------------------------------------
@@ -32,8 +34,8 @@ private
         "<span style='white-space:nowrap;'>#{registration.receipt_code}</span>",
         name_and_avatar(registration),
         present(registration).balance_or_paid,
-        "<span style='white-space:nowrap;'>#{format_date(registration.created_at)}</span>",
-        (registration.user_profile.user ? present(registration.user_profile.user).last_access : colored_label('no user', :gray))
+        "<span class='date'>#{format_date(registration.created_at)}</span>",
+        "<span class='date'>#{(registration.user_profile.user ? present(registration.user_profile.user).last_access : colored_label('no user', :gray))}</span>"
       ]
     end
   end
@@ -46,13 +48,22 @@ private
   #------------------------------------------------------------------------------
   def name_and_avatar(registration)
     # image_tag(registration.user_profile.public_avatar_url(:sq35), width: 25, height: 25) + link_to(registration.full_name, url_helpers.edit_admin_registration_path(I18n.locale, registration))
-    link_to(registration.full_name, url_helpers.edit_admin_registration_path(I18n.locale, registration))
+    if @permissions[:manage_event_registrations]
+      link_to(registration.full_name, url_helpers.edit_admin_registration_path(I18n.locale, registration))
+    else
+      registration.full_name
+    end
   end
   
   #------------------------------------------------------------------------------
   def fetch_registrations
     @workshop     = Workshop.find_by_slug(params[:id])
     registrations = @workshop.registrations.includes(:workshop_price, :user_profile => [:user => :current_site_profile]).references(:user_profiles).order("#{sort_column} #{sort_direction}")
+
+    if !@permissions[:manage_event_registrations] && !@permissions[:manage_event_finances]
+      # limit to your own registration if can only edit the workshop
+      registrations = registrations.where(user_profile_id: @user.user_profile.id)
+    end
     if params[:duplicates].present?
       #--- grab only registrations that have duplicates (based on the user_profile_id)
       grouped       = registrations.group(:user_profile_id)
@@ -70,10 +81,14 @@ private
   def registration_actions(registration)
     actions = ''
     actions += '<div class="btn-group">'
-      actions += "<button class='btn btn-xs dropdown-toggle btn-#{registration.current_state} hovertip' data-placement='right' data-toggle='dropdown' title='#{registration.current_state.capitalize} on #{format_date(registration.process_changed_on)}'><i class='caret'></i></button>"
-      actions += '<ul class="dropdown-menu">'
-        actions += action_list(registration)
-      actions += '</ul>'
+      if @permissions[:manage_event_registrations]
+        actions += "<button class='btn btn-xs dropdown-toggle btn-#{registration.current_state} hovertip' data-placement='right' data-toggle='dropdown' title='#{registration.current_state.capitalize} on #{format_date(registration.process_changed_on)}'><i class='caret'></i></button>"
+        actions += '<ul class="dropdown-menu">'
+          actions += action_list(registration)
+        actions += '</ul>'
+      else
+        actions += "<button class='btn btn-xs btn-#{registration.current_state} hovertip' data-placement='right' title='#{registration.current_state.capitalize} on #{format_date(registration.process_changed_on)}'></button>"
+      end
     actions += '</div>'
   end
   

data/app/models/dm_event/concerns/ability.rb

@@ -1,38 +1,68 @@
-# Wrap forum specific CanCan rules.  Should be included in the main app's
+# Wrap event specific CanCan rules.  Should be included in the main app's
 # Ability class.
 # NOTE:  When checking abilities, don't check for Class level abilities,
 # unless you don't care about the instance level.  For example, don't
 # use both styles
-#   can? :moderate, Forum
-#   can? :moderate, @forum
+#   can? :moderate, Workshop
+#   can? :moderate, @workshop
 # In this case, if you need to check the class level, then use specific
-#    current_user.has_role? :moderator, Forum
+#    current_user.has_role? :moderator, Workshop
 #------------------------------------------------------------------------------
-
 module DmEvent
   module Concerns
     module Ability
       def dm_event_abilities(user)
         if user
+          # an `event_manager` gets access to all workshops, registration, and finances.
           if user.has_role?(:event_manager)
             can :manage_events, :all
+            can :manage_event_registrations, :all
+            can :manage_event_finances, :all
+            can :access_event_section, :all
+            can :list_events, :all
+            # can :access_media_library, :all
+            can :access_admin, :all
+          elsif user.has_role?(:event_manager_alacarte)
+            # allowed to access the backend event section
+            can :access_event_section, :all
             can :access_admin, :all
+
+            # can edit a workshop, including workshop prices and email templates
+            # (does not include access to registrations or finances)
+            manage_event_ids = @user_roles.select {|r| r.name == 'manage_event' && r.resource_type == 'Workshop'}.map(&:resource_id)
+            can :manage_events, Workshop, id: manage_event_ids
+            # can(:access_media_library, :all) unless manage_event_ids.empty?
+            
+            # can see and manage a workshops registrations
+            manage_event_registration_ids = @user_roles.select {|r| r.name == 'manage_event_registration' && r.resource_type == 'Workshop'}.map(&:resource_id)
+            can :manage_event_registrations, Workshop, id: manage_event_registration_ids
+
+            # can see and manage a workshops finances
+            manage_event_finance_ids = @user_roles.select {|r| r.name == 'manage_event_finance' && r.resource_type == 'Workshop'}.map(&:resource_id)
+            can :manage_event_finances, Workshop, id: manage_event_finance_ids
+            
+            can :list_events, Workshop, id: (manage_event_ids + manage_event_registration_ids + manage_event_finance_ids).uniq
           end
+
         end
       end
+
+      ::Ability.register_abilities(:dm_event_abilities)
+      
     end
   end
 end
 
+
 #------------------------------------------------------------------------------
 # The abilities get basically compiled.  So if you use
 #
-#    can :moderate, Forum, :id => Forum.with_role(:moderator, user).map(&:id)
+#    can :moderate, Workshop, :id => Workshop.with_role(:moderator, user).map(&:id)
 #
-# this will execute the Forum.with_role query once during Ability.new.  However
+# this will execute the Workshop.with_role query once during Ability.new.  However
 #
-#    can :moderate, Forum do |forum|
-#      user.has_role? :moderator, forum
+#    can :moderate, Workshop do |workshop|
+#      user.has_role? :moderator, workshop
 #    end
 #
 # this will execute the has_role? block on each call to can?

data/app/models/dm_event/model_decorators.rb

@@ -4,3 +4,4 @@
 #------------------------------------------------------------------------------
 
 UserProfile.send(:include, DmEvent::Concerns::UserProfile)
+Ability.send(:include, DmEvent::Concerns::Ability)

data/app/models/dm_event/permitted_params.rb

@@ -1,20 +1,22 @@
 module DmEvent
   module PermittedParams
 
+    # access to this is protected before the call
     #------------------------------------------------------------------------------
     def workshop_params
-      params.require(:workshop).permit! if can? :manage_events, :all
+      params.require(:workshop).permit!
     end
 
+    # access to this is protected before the call
     #------------------------------------------------------------------------------
     def workshop_price_params
-      params.require(:workshop_price).permit! if can? :manage_events, :all
+      params.require(:workshop_price).permit!
     end
 
     #------------------------------------------------------------------------------
-    def registration_params
+    def registration_params(workshop)
       return nil if params[:registration].nil? || params[:registration].empty?
-      if can? :manage_events, :all
+      if can?(:manage_event_registrations, @workshop)
         params.require(:registration).permit!
       else
         # nested attributes: because field_data can be either a single value or an array of values,
@@ -26,9 +28,10 @@ module DmEvent
       end
     end
 
+    # access to this is protected before the call
     #------------------------------------------------------------------------------
     def system_email_params
-      params.require(:system_email).permit! if can? :manage_events, :all
+      params.require(:system_email).permit!
     end
     
   end

data/app/views/dm_event/admin/registrations/_form.html.erb

@@ -165,11 +165,6 @@
           <% end %>
         <% end %>
 
-        <%= subsection title: 'Payment Reminders' do %>
-          <%= f.input :preferred_payment_reminder_hold_until, label: 'No reminder until', as: :date_picker, input_wrapper_html: {class: 'col-sm-4'},
-                       hint: 'When sending reminders in batch, this persons reminder will not be sent unless after the specified date' %>
-        <% end %>
-        
         <%= submit_or_cancel cancel_url: admin_workshop_path(@workshop), delete_url: [:admin, @registration], delete_confirm: 'Are you sure you wish to delete this registration?  Any associated payments will also be deleted!' %>
       <% end %>
     </div>
@@ -211,7 +206,15 @@
       <% end %>
       
       <%= subsection title: 'Payment Reminders' do %>
+        <%= simple_form_for @registration, url: admin_registration_path,
+              html: { class: 'form-horizontal' }, wrapper: :bs3_horizontal_form, wrapper_mappings: DmAdmin::FormWrapperMappings do |f| %>
+          <%= f.input :preferred_payment_reminder_hold_until, label: 'No reminder until', as: :date_picker, input_wrapper_html: {class: 'col-sm-4'},
+                       hint: 'When sending reminders in batch, this persons reminder will not be sent unless after the specified date' %>
       
+          <%= submit_or_cancel cancel: false %>
+        <% end %>
+        <hr/>
+
         <table class="table table-condensed table-gradient table-hover" style="margin-bottom: 20px;">
           <thead>
             <tr>

data/app/views/dm_event/admin/workshops/_registration_stats.html.erb

@@ -1,58 +1,62 @@
-<%= subsection title: 'Registration Statistics' do %>
-  <% num_registrations = workshop.registrations.count %>
-  <div class="block progress-statistics">
-    <% num = workshop.registrations.number_of(:attending) %>
-    <%= slim_progress_bar(label: 'Attending', value: "#{num} / #{num.percent_of(num_registrations).to_s}%", color: 'success', percentage: num.percent_of(num_registrations)) %>
-    <% if (num = workshop.registrations.number_of(:pending)) > 0 %>
-      <%= slim_progress_bar(label: 'Pending', value: "#{num}", color: 'pending', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-    <% num = workshop.registrations.number_of(:accepted) %>
-    <%= slim_progress_bar(label: 'Accepted', value: "#{num}", color: 'accepted', percentage: num.percent_of(num_registrations)) %>
-    <% num = workshop.registrations.number_of(:paid) %>
-    <%= slim_progress_bar(label: 'Paid', value: "#{num}", color: 'paid', percentage: num.percent_of(num_registrations)) %>
-    <% if (num = workshop.registrations.number_of(:waitlisted)) > 0 %>
-      <%= slim_progress_bar(label: 'Waitlisted', value: "#{num}", color: 'waitlisted', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-    <% if (num = workshop.registrations.number_of(:reviewing)) > 0 %>
-      <%= slim_progress_bar(label: 'Reviewing', value: "#{num}", color: 'reviewing', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-    <% if (num = workshop.registrations.number_of(:rejected)) > 0 %>
-      <%= slim_progress_bar(label: 'Rejected', value: "#{num}", color: 'rejected', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-    <% if (num = workshop.registrations.number_of(:canceled)) > 0 %>
-      <%= slim_progress_bar(label: 'Canceled', value: "#{num}", color: 'canceled', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-    <% if (num = workshop.registrations.number_of(:refunded)) > 0 %>
-      <%= slim_progress_bar(label: 'Refunded', value: "#{num}", color: 'refunded', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-    <% if (num = workshop.registrations.number_of(:noshow)) > 0 %>
-      <%= slim_progress_bar(label: 'No Show', value: "#{num}", color: 'noshow', percentage: num.percent_of(num_registrations)) %>
-    <% end %>
-  </div>
-<% end %>
-
-<% unless @workshop.workshop_prices.empty? %>
-  <%= subsection title: 'Price Distribution' do %>
-    <% financials = @workshop.financial_details(:summary) %>
-    <ul class="statistics statistics-small statistics-linear">
-      <li><%= stat_block_small label: 'Best', number: financials[:summary][:total_possible].format(no_cents_if_whole: true), color_type: :info, icon: 'icon-coin', percent: 100 %></li>
-      <li><%= stat_block_small label: 'Worst (80%)', number: financials[:summary][:total_possible_worst].format(no_cents_if_whole: true), color_type: :warning, icon: 'icon-coin', percent: 80 %></li>
-      <li><%= stat_block_small label: 'Paid', number: financials[:summary][:total_paid].format(no_cents_if_whole: true), color_type: :success, icon: 'icon-coin', percent: financials[:summary][:total_paid_percent] %></li>
-    </ul>
-    <%= link_to 'Financial Details', financials_admin_workshop_url(@workshop) %>
-    <hr>
+<% if can?(:manage_event_registrations, @workshop) || can?(:manage_event_finances, @workshop) %>
+  <%= subsection title: 'Registration Statistics' do %>
+    <% num_registrations = workshop.registrations.count %>
     <div class="block progress-statistics">
-      <% num_attending = workshop.registrations.number_of(:attending) %>
-      <% workshop.registrations.number_of(:for_all_prices).each do |price_id, registration_count| %>
-        <% if price_id %>
-          <% price = WorkshopPrice.find_by_id(price_id ) %>
-          <%= slim_progress_bar(label: price.price_formatted, value: registration_count, color: 'success', 
-                  percentage: registration_count.percent_of(num_attending), bottom_label: price.price_description) %>
-        <% else %>
-          <%= slim_progress_bar(label: 'no pricing selected', value: registration_count, color: 'noshow', 
-                  percentage: registration_count.percent_of(num_attending), bottom_label: '') %>
-        <% end %>
+      <% num = workshop.registrations.number_of(:attending) %>
+      <%= slim_progress_bar(label: 'Attending', value: "#{num} / #{num.percent_of(num_registrations).to_s}%", color: 'success', percentage: num.percent_of(num_registrations)) %>
+      <% if (num = workshop.registrations.number_of(:pending)) > 0 %>
+        <%= slim_progress_bar(label: 'Pending', value: "#{num}", color: 'pending', percentage: num.percent_of(num_registrations)) %>
+      <% end %>
+      <% num = workshop.registrations.number_of(:accepted) %>
+      <%= slim_progress_bar(label: 'Accepted', value: "#{num}", color: 'accepted', percentage: num.percent_of(num_registrations)) %>
+      <% num = workshop.registrations.number_of(:paid) %>
+      <%= slim_progress_bar(label: 'Paid', value: "#{num}", color: 'paid', percentage: num.percent_of(num_registrations)) %>
+      <% if (num = workshop.registrations.number_of(:waitlisted)) > 0 %>
+        <%= slim_progress_bar(label: 'Waitlisted', value: "#{num}", color: 'waitlisted', percentage: num.percent_of(num_registrations)) %>
+      <% end %>
+      <% if (num = workshop.registrations.number_of(:reviewing)) > 0 %>
+        <%= slim_progress_bar(label: 'Reviewing', value: "#{num}", color: 'reviewing', percentage: num.percent_of(num_registrations)) %>
+      <% end %>
+      <% if (num = workshop.registrations.number_of(:rejected)) > 0 %>
+        <%= slim_progress_bar(label: 'Rejected', value: "#{num}", color: 'rejected', percentage: num.percent_of(num_registrations)) %>
+      <% end %>
+      <% if (num = workshop.registrations.number_of(:canceled)) > 0 %>
+        <%= slim_progress_bar(label: 'Canceled', value: "#{num}", color: 'canceled', percentage: num.percent_of(num_registrations)) %>
+      <% end %>
+      <% if (num = workshop.registrations.number_of(:refunded)) > 0 %>
+        <%= slim_progress_bar(label: 'Refunded', value: "#{num}", color: 'refunded', percentage: num.percent_of(num_registrations)) %>
+      <% end %>
+      <% if (num = workshop.registrations.number_of(:noshow)) > 0 %>
+        <%= slim_progress_bar(label: 'No Show', value: "#{num}", color: 'noshow', percentage: num.percent_of(num_registrations)) %>
       <% end %>
     </div>
   <% end %>
 <% end %>
+
+<% if can?(:manage_event_finances, @workshop) %>
+  <% unless @workshop.workshop_prices.empty? %>
+    <%= subsection title: 'Price Distribution' do %>
+      <% financials = @workshop.financial_details(:summary) %>
+      <ul class="statistics statistics-small statistics-linear">
+        <li><%= stat_block_small label: 'Best', number: financials[:summary][:total_possible].format(no_cents_if_whole: true), color_type: :info, icon: 'icon-coin', percent: 100 %></li>
+        <li><%= stat_block_small label: 'Worst (80%)', number: financials[:summary][:total_possible_worst].format(no_cents_if_whole: true), color_type: :warning, icon: 'icon-coin', percent: 80 %></li>
+        <li><%= stat_block_small label: 'Paid', number: financials[:summary][:total_paid].format(no_cents_if_whole: true), color_type: :success, icon: 'icon-coin', percent: financials[:summary][:total_paid_percent] %></li>
+      </ul>
+      <%= link_to 'Financial Details', financials_admin_workshop_url(@workshop) %>
+      <hr>
+      <div class="block progress-statistics">
+        <% num_attending = workshop.registrations.number_of(:attending) %>
+        <% workshop.registrations.number_of(:for_all_prices).each do |price_id, registration_count| %>
+          <% if price_id %>
+            <% price = WorkshopPrice.find_by_id(price_id ) %>
+            <%= slim_progress_bar(label: price.price_formatted, value: registration_count, color: 'success', 
+                    percentage: registration_count.percent_of(num_attending), bottom_label: price.price_description) %>
+          <% else %>
+            <%= slim_progress_bar(label: 'no pricing selected', value: registration_count, color: 'noshow', 
+                    percentage: registration_count.percent_of(num_attending), bottom_label: '') %>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/dm_event/admin/workshops/index.html.erb

@@ -1,8 +1,8 @@
 <% content_for :content_title, 'Workshop Dashboard' %>
 <% content_for :content_title_extra do %>
   <%= page_header_buttons do %>
-    <%= link_to('Outstanding Balances', admin_workshop_user_outstanding_balances_path, title: 'Outstanding Balances', class: "btn btn-xs btn-default") %>
-    <%= link_to(icon_label(:new, 'New'), new_admin_workshop_path, title: 'New Workshop', class: "btn btn-xs btn-default") %>
+    <%= link_to('Outstanding Balances', admin_workshop_user_outstanding_balances_path, title: 'Outstanding Balances', class: "btn btn-xs btn-default") if can?(:manage_events, :all) %>
+    <%= link_to(icon_label(:new, 'New'), new_admin_workshop_path, title: 'New Workshop', class: "btn btn-xs btn-default") if can?(:manage_events, :all) %>
   <% end %>
 <% end %>
 
@@ -12,49 +12,53 @@
       <% panel_class = workshop.registration_closed? ? 'panel-default' : 'panel-success' %>
       <div class="col-md-6">
         <%= panel title: link_to(workshop.title, [:admin, workshop]), subtitle: present(workshop).start_end_date, class: panel_class do %>
-          <% financials = workshop.financial_details(:summary) %>
-          <ul class="statistics">
-            <li><%= stat_block_small label: 'Projected', number: financials[:summary][:total_possible].format(no_cents_if_whole: true), color_type: :info, icon: 'icon-coin', percent: 100 %></li>
-            <li><%= stat_block_small label: 'Paid', number: financials[:summary][:total_paid].format(no_cents_if_whole: true), color_type: :success, icon: 'icon-coin', percent: financials[:summary][:total_paid_percent] %></li>
-            <li><%= stat_block_small label: 'Unpaid', number: financials[:summary][:total_outstanding].format(no_cents_if_whole: true), color_type: :danger, icon: 'icon-coin', percent: 80 %></li>
-          </ul>
-          
-          <div class="separator-reflected" style="margin: 10px 0px;"></div>
-          <% num_registrations = workshop.registrations.count %>
-          <div class="block progress-statistics">
-            <% num = workshop.registrations.number_of(:attending) %>
-            <%= slim_progress_bar(label: 'Attending', value: "#{num} / #{num.percent_of(num_registrations).to_s}%", color: 'success', percentage: num.percent_of(num_registrations)) %>
-          </div>
-          <div class="row">
-            <div class="col-md-6">
-              <div class="block well progress-statistics">
-                <div class="body">
-                  <% num = workshop.registrations.number_of(:accepted) %>
-                  <%= slim_progress_bar(label: 'Accepted', value: "#{num}", color: 'accepted', percentage: num.percent_of(num_registrations)) %>
-                  <% num = workshop.registrations.number_of(:paid) %>
-                  <div class="semi-block">
-                    <%= slim_progress_bar(label: 'Paid', value: "#{num}", color: 'paid', percentage: num.percent_of(num_registrations)) %>
-                  </div>
-                  <% num = workshop.registrations.number_of(:pending) %>
-                  <div class="semi-block">
-                    <%= slim_progress_bar(label: 'Pending', value: "#{num}", color: 'pending', percentage: num.percent_of(num_registrations)) %>
+          <% if can? :manage_event_finances, workshop %>
+            <% financials = workshop.financial_details(:summary) %>
+            <ul class="statistics">
+              <li><%= stat_block_small label: 'Projected', number: financials[:summary][:total_possible].format(no_cents_if_whole: true), color_type: :info, icon: 'icon-coin', percent: 100 %></li>
+              <li><%= stat_block_small label: 'Paid', number: financials[:summary][:total_paid].format(no_cents_if_whole: true), color_type: :success, icon: 'icon-coin', percent: financials[:summary][:total_paid_percent] %></li>
+              <li><%= stat_block_small label: 'Unpaid', number: financials[:summary][:total_outstanding].format(no_cents_if_whole: true), color_type: :danger, icon: 'icon-coin', percent: 80 %></li>
+            </ul>
+          <% end %>
+
+          <% if can?(:manage_event_finances, workshop) || can?(:manage_event_registrations, workshop) %>
+            <div class="separator-reflected" style="margin: 10px 0px;"></div>
+            <% num_registrations = workshop.registrations.count %>
+            <div class="block progress-statistics">
+              <% num = workshop.registrations.number_of(:attending) %>
+              <%= slim_progress_bar(label: 'Attending', value: "#{num} / #{num.percent_of(num_registrations).to_s}%", color: 'success', percentage: num.percent_of(num_registrations)) %>
+            </div>
+            <div class="row">
+              <div class="col-md-6">
+                <div class="block well progress-statistics">
+                  <div class="body">
+                    <% num = workshop.registrations.number_of(:accepted) %>
+                    <%= slim_progress_bar(label: 'Accepted', value: "#{num}", color: 'accepted', percentage: num.percent_of(num_registrations)) %>
+                    <% num = workshop.registrations.number_of(:paid) %>
+                    <div class="semi-block">
+                      <%= slim_progress_bar(label: 'Paid', value: "#{num}", color: 'paid', percentage: num.percent_of(num_registrations)) %>
+                    </div>
+                    <% num = workshop.registrations.number_of(:pending) %>
+                    <div class="semi-block">
+                      <%= slim_progress_bar(label: 'Pending', value: "#{num}", color: 'pending', percentage: num.percent_of(num_registrations)) %>
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="col-md-6">
-              <div class="block well progress-statistics">
-                <div class="body">
-                  <% num = workshop.registrations.number_of(:waitlisted) %>
-                  <%= slim_progress_bar(label: 'Waitlisted', value: "#{num}", color: 'waitlisted', percentage: num.percent_of(num_registrations)) %>
-                  <% num = workshop.registrations.number_of(:reviewing) %>
-                  <div class="semi-block">
-                    <%= slim_progress_bar(label: 'Reviewing', value: "#{num}", color: 'reviewing', percentage: num.percent_of(num_registrations)) %>
+              <div class="col-md-6">
+                <div class="block well progress-statistics">
+                  <div class="body">
+                    <% num = workshop.registrations.number_of(:waitlisted) %>
+                    <%= slim_progress_bar(label: 'Waitlisted', value: "#{num}", color: 'waitlisted', percentage: num.percent_of(num_registrations)) %>
+                    <% num = workshop.registrations.number_of(:reviewing) %>
+                    <div class="semi-block">
+                      <%= slim_progress_bar(label: 'Reviewing', value: "#{num}", color: 'reviewing', percentage: num.percent_of(num_registrations)) %>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
+          <% end %>
         
         <% end %>
       </div>
@@ -71,26 +75,30 @@
           <th>Projected</th>
           <th>Paid</th>
           <th>Unpaid</th>
-          <th width="150">Date</th>
+          <th class="date">Date</th>
         </tr>
       </thead>
       <tbody>
         <% @workshops_past.each do |workshop| %>
           <% # TODO very ineffecient to do for each workshop.  look at caching values %>
-          <% financials = workshop.financial_details(:summary) %>
+          <% financials = workshop.financial_details(:summary) if can?(:manage_event_finances, workshop) %>
           <% present workshop do |workshop_presenter| %>
             <tr class="item" data-item_id="<%= workshop.id %>">
               <td>
                 <%= link_to workshop.title, [:admin, workshop] %>
               </td>
-              <td><%= financials[:summary][:total_possible].format(no_cents_if_whole: true) %></td>
-              <td><span class="text-success"><%= financials[:summary][:total_paid].format(no_cents_if_whole: true) %></span></td>
+              <td><%= can?(:manage_event_finances, workshop) ? financials[:summary][:total_possible].format(no_cents_if_whole: true) : 'n/a' %></td>
+              <td><span class="text-success"><%= can?(:manage_event_finances, workshop) ? financials[:summary][:total_paid].format(no_cents_if_whole: true) : 'n/a' %></span></td>
               <td>
-                <%= '<span class="text-danger">'.html_safe if financials[:summary][:total_outstanding].positive? %>
-                <%= financials[:summary][:total_outstanding].format(no_cents_if_whole: true) %>
-                <%= '</span>'.html_safe if financials[:summary][:total_outstanding].positive? %>
+                <% if can?(:manage_event_finances, workshop) %>
+                  <%= '<span class="text-danger">'.html_safe if financials[:summary][:total_outstanding].positive? %>
+                  <%= financials[:summary][:total_outstanding].format(no_cents_if_whole: true) %>
+                  <%= '</span>'.html_safe if financials[:summary][:total_outstanding].positive? %>
+                <% else %>
+                  n/a
+                <% end %>
               </td>
-              <td><%= workshop_presenter.start_end_date %></td>
+              <td class="date"><%= workshop_presenter.start_end_date %></td>
             </tr>
           <% end %>
         <% end %>

data/app/views/dm_event/admin/workshops/permissions.html.erb

@@ -0,0 +1,58 @@
+<% content_for :content_title, "Permissions" %>
+<% content_for :content_subtitle, "#{@workshop.title}" %>
+
+<div class="row">
+  <div class="col-md-8">
+    <%= panel body: false, title: "Permissions" do %>
+      <div class="panel-body">
+        <p>The users below can be granted different levels of access to this particular workshop.</p>
+  
+        <% @event_managers_alacarte.each do |user| %>
+          <div class="row">
+            <div class="col-md-12">
+              <%= subsection title: user.full_name do %>
+                <% manage_event_state = user.has_role?(:manage_event, @workshop) ? 'btn-success active' : 'btn-default' %>
+                <% manage_event_registration_state = user.has_role?(:manage_event_registration, @workshop) ? 'btn-success active' : 'btn-default' %>
+                <% manage_event_finance_state = user.has_role?(:manage_event_finance, @workshop) ? 'btn-success active' : 'btn-default' %>
+                <%= link_to 'Workshop Editing',     dm_event.ajax_toggle_permission_admin_workshop_path(@workshop, user.id, :manage_event), class: "permission_btn btn btn-xs #{manage_event_state}", role: 'button', remote: true, method: :patch %>
+                <%= link_to 'Manage Registrations', dm_event.ajax_toggle_permission_admin_workshop_path(@workshop, user.id, :manage_event_registration), class: "permission_btn btn btn-xs #{manage_event_registration_state}", role: 'button', remote: true, method: :patch %>
+                <%= link_to 'View Finances',        dm_event.ajax_toggle_permission_admin_workshop_path(@workshop, user.id, :manage_event_finance), class: "permission_btn btn btn-xs #{manage_event_finance_state}", role: 'button', remote: true, method: :patch %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+
+    <% end %>
+  </div>
+  <div class="col-md-4">
+    <%= panel body: false, title: "Event Managers" do %>
+      <div class="panel-body">
+        <p>Current users that can fully manage this event</p>
+      </div>
+  
+      <table class="table table-bordered table-condensed table-striped">
+        <tbody>
+          <% @event_managers.each do |user| %>
+            <tr>
+              <td><%= user.full_name %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% end %>
+  </div>
+</div>
+<script>
+$(document).ready(function() {
+  $('.permission_btn').on("ajax:success", function(e, content) {
+    if ($(this).is(".active")) {
+      $(this).addClass("btn-default");
+      $(this).removeClass("active").removeClass("btn-success");
+    } else {
+      $(this).addClass("active").addClass("btn-success");
+      $(this).removeClass("btn-default");
+    }
+  });
+});
+</script

data/app/views/dm_event/admin/workshops/show.html.erb

@@ -5,11 +5,24 @@
     <div class="btn-group">
       <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i> <span class="caret"></span></button>
       <ul class="dropdown-menu dropdown-menu-right icons-right">
-        <li><%= link_to label_icon('Edit Workshop', :edit), edit_admin_workshop_url(@workshop) %></li>
-        <li><%= link_to label_icon('Financial Details', 'icon-coin'), financials_admin_workshop_url(@workshop) %></li>
-        <li><%= link_to label_icon('Show Duplicates', 'icon-copy'), admin_workshop_url(@workshop, duplicates: '1') %></li>
-        <li><%= link_to label_icon('Lost Users', 'icon-users'), lost_users_admin_workshop_url(@workshop) %></li>
-        <li><%= link_to 'Export Registrations (.csv)', admin_workshop_url(@workshop, format: 'csv') %></li>
+        <% if can?(:manage_event_registrations, @workshop) %>
+          <li class="divider"></li>
+          <li><%= link_to label_icon('Show Duplicates', 'icon-copy'), admin_workshop_url(@workshop, duplicates: '1') %></li>
+          <li><%= link_to label_icon('Lost Users', 'icon-users'), lost_users_admin_workshop_url(@workshop) %></li>
+          <li><%= link_to 'Export Registrations (.csv)', admin_workshop_url(@workshop, format: 'csv') %></li>
+        <% end %>
+        <% if can?(:manage_events, @workshop) %>
+          <li class="divider"></li>
+          <li><%= link_to label_icon('Edit Workshop', :edit), edit_admin_workshop_url(@workshop) %></li>
+        <% end %>
+        <% if can?(:manage_event_finances, @workshop) %>
+          <li class="divider"></li>
+          <li><%= link_to label_icon('Financial Details', 'icon-coin'), financials_admin_workshop_url(@workshop) %></li>
+        <% end %>
+        <% if can?(:manage_events, :all) %>
+          <li class="divider"></li>
+          <li><%= link_to label_icon('Permissions', 'icon-lock'), permissions_admin_workshop_url(@workshop) %></li>
+        <% end %>
         
       </ul>
     </div>
@@ -19,7 +32,11 @@
 <div class="row">
   <div class="col-md-9">
     <% toolbar  = toolbar_btn(icons(:new), register_new_url(@workshop), target: '_blank', title: 'New Registration', class: "btn btn-link btn-icon") %>
-    <% title    = params[:duplicates].nil? ? 'Registrations' : 'Registrations (Duplicates)'%>
+    <% if can?(:manage_event_registrations, @workshop) || can?(:manage_event_finances, @workshop) %>
+      <% title    = params[:duplicates].nil? ? 'Registrations' : 'Registrations (Duplicates)'%>
+    <% else %>
+      <% title    = 'Registrations (only displaying personal registrations)' %>
+    <% end %>
     <%= panel title: title, toolbar: toolbar, body: false do %>
       <table id="registration_table" class="table table-striped table-bordered" data-source="<%= dm_event.admin_workshop_url(@workshop, duplicates: params[:duplicates]) %>">
         <thead>
@@ -28,8 +45,8 @@
             <th width=50>Receipt</th>
             <th>Name</th>
             <th width=25>Balance</th>
-            <th width=85>Registered</th>
-            <th width=85>Last Login</th>
+            <th class="date">Registered</th>
+            <th class="date">Last Login</th>
           </tr>
         </thead>
         <tbody>
@@ -38,10 +55,12 @@
     <% end %>
   </div>
 
-  <div class="col-md-3">
-    <%= panel header: false do %>
-      <%= render partial: 'registration_stats', locals: {workshop: @workshop} %>
-    <% end %>
-  </div>
+  <% if can?(:manage_event_registrations, @workshop) || can?(:manage_event_finances, @workshop) %>
+    <div class="col-md-3">
+      <%= panel header: false do %>
+        <%= render partial: 'registration_stats', locals: {workshop: @workshop} %>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 

data/config/initializers/dm_event.rb

@@ -1 +1 @@
-ActiveMerchant::Billing::Base.mode = :test unless Rails.env.production?
+ActiveMerchant::Billing::Base.mode = :test unless Rails.env.production?

data/config/routes.rb

@@ -8,6 +8,8 @@ DmEvent::Engine.routes.draw do
             match 'edit_system_email/:email_type',      action: 'edit_system_email', as: 'edit_system_email', via: [:get, :post, :patch]
             get   'financials',                         action: 'financials'
             match 'lost_users',                         action: 'lost_users', via: [:get, :post, :patch]
+            match 'permissions',                        action: 'permissions', via: [:get, :post, :patch]
+            patch 'ajax_toggle_permission/:user_id/:role', action: 'ajax_toggle_permission', as: 'ajax_toggle_permission'
             patch 'send_payment_reminder_emails',       action: 'send_payment_reminder_emails'
             match 'additional_configuration',           action: 'additional_configuration', via: [:get, :patch]
           end

data/lib/dm_event/engine.rb

@@ -15,6 +15,5 @@ module DmEvent
       g.assets false
       g.helper false
     end
-    
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_event
 version: !ruby/object:Gem::Version
-  version: 4.2.1.5
+  version: 4.2.2
 platform: ruby
 authors:
 - Brett Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.5
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.5
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: dm_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.5
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1.5
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +239,7 @@ files:
 - app/views/dm_event/admin/workshops/index.html.erb
 - app/views/dm_event/admin/workshops/lost_users.html.erb
 - app/views/dm_event/admin/workshops/new.html.erb
+- app/views/dm_event/admin/workshops/permissions.html.erb
 - app/views/dm_event/admin/workshops/show.html.erb
 - app/views/dm_event/admin/workshops/user_outstanding_balances.html.erb
 - app/views/dm_event/liquid_tags/_funding_project_status.html.erb
@@ -414,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Part of MokshaCms, Event Engine