From 19819515e43fb048d235d855ee795dabd849b5e0 Mon Sep 17 00:00:00 2001 From: Ben Teitelbaum Date: Sun, 22 Feb 2015 22:58:38 -0800 Subject: [PATCH] split manage/message and clean up those views #14 --- app/controllers/events_controller.rb | 25 ++++++-- app/controllers/workshops_controller.rb | 5 ++ app/models/ability.rb | 5 +- app/views/events/_form.html.erb | 6 +- app/views/events/manage.html.erb | 74 +++++++++------------ app/views/events/message.html.erb | 31 +++++++++ app/views/workshops/manage.html.erb | 85 ------------------------- app/views/workshops/message.html.erb | 38 +++++++++++ config/routes.rb | 9 ++- 9 files changed, 137 insertions(+), 141 deletions(-) create mode 100644 app/views/events/message.html.erb delete mode 100755 app/views/workshops/manage.html.erb create mode 100644 app/views/workshops/message.html.erb diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index f48d5d5f..cfbac197 100755 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -70,20 +70,33 @@ def show # GET /events/1/manage # GET /events/1.json/manage - def manage_attendees + def manage if @event.manageable? @activities_n_counts = Activity.activities_n_counts(:limit => 20, :trackable => @event) - respond_to do |format| - format.html { render 'manage' } - format.json { render json: @event } - end + render 'manage' else if not @event.rsvp render_error(:message => 'Cannot manage attendees because RSVP is not set for this workshop', :status => :unauthorized) elsif @event.external render_error(:message => 'Cannot manage attendees of an external workshop', :status => :unauthorized) else - render_error(:message => 'Workshop unmanageable for some reason', :status => :unauthorized) + raise "workshop unmanageable for some unknown reason" + end + end + end + + # GET /events/1/message + # GET /events/1.json/message + def message + if @event.manageable? + render 'message' + else + if not @event.rsvp + render_error(:message => 'Cannot message attendees because RSVP is not set for this workshop', :status => :unauthorized) + elsif @event.external + render_error(:message => 'Cannot message attendees of an external workshop', :status => :unauthorized) + else + raise "workshop unmessageable for some unknown reason" end end end diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb index 323a0267..38b72ce0 100755 --- a/app/controllers/workshops_controller.rb +++ b/app/controllers/workshops_controller.rb @@ -141,6 +141,11 @@ def update def manage @attendees = @workshop.attendees.uniq end + + # GET /w/:id/message(.:format) + def message + @attendees = @workshop.attendees.uniq + end # POST /w/1/sms_attendees def sms_attendees diff --git a/app/models/ability.rb b/app/models/ability.rb index a3b3f537..c5ffe42c 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -2,7 +2,7 @@ class Ability include CanCan::Ability def initialize(user, session) - alias_action :edit, :update, :destroy, :accept_attendee, :cancel_attend, :manage_attendees, :lock, :unlock, :sms_attendees, :upload_photo, :manage, :to => :manage_as_host + alias_action :edit, :update, :destroy, :accept_attendee, :cancel_attend, :lock, :unlock, :sms_attendees, :upload_photo, :manage, :message, :to => :manage_as_host # anyone can [:show, :attend_by_email], Event @@ -27,7 +27,8 @@ def initialize(user, session) end can [:plus, :minus, :create, :index, :destroy], Review, :author_id => user.id - + + cannot :manage_as_host, Workshop can :simple_index_partial, Workshop # host if user.host? diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb index 3f58fdd8..39532696 100755 --- a/app/views/events/_form.html.erb +++ b/app/views/events/_form.html.erb @@ -1,9 +1,9 @@ - <%= simple_form_for(@event) do |f| %>
- +
- <%= iconic_link_to 'Message attendees', manage_event_path(@event), class: 'btn btn-sm btn-default', title: 'message all' , icon: 'send' %> + <%= iconic_link_to 'Message attendees', message_event_path(@event), class: 'btn btn-sm btn-default', title: 'message attendees' , icon: 'send' %> + <%= iconic_link_to 'Manage attendees', manage_event_path(@event), class: 'btn btn-sm btn-default', title: 'message attendees' , icon: 'group' %> <%= iconic_link_to 'Configure alerts', edit_workshop_path(@event.workshop), class: 'btn btn-sm btn-default', title: 'configure alerts' , icon: 'exclamation-circle' %> <%= iconic_link_to 'Delete', @event, confirm: 'Are you sure?', method: :delete, class: 'btn btn-sm btn-danger', title: 'delete', id: 'delete_event_link' %>
diff --git a/app/views/events/manage.html.erb b/app/views/events/manage.html.erb index e91668a7..ac7f3f37 100755 --- a/app/views/events/manage.html.erb +++ b/app/views/events/manage.html.erb @@ -1,51 +1,39 @@ -<% if (@event.host === current_user) or admin_session? %> -

<%= link_to @event.workshop.title, edit_workshop_path(@event.workshop) %>

-

hosted by <%= contextualized_user_link(@event.host, :linked => true) %> · - <%= event_price(@event, :show_materials_fee => true) %> · - <%= @event.max_attendees %> slots · - <%= pluralize(@event.attendances.count, 'person') %> signed up · - meets <%= @event.meetings.count == 1 ? 'once' : (@event.meetings.count == 2 ? 'twice' : pluralize(@event.meetings.count, 'time')) %> -

- <%= link_to 'message all attendees in series', manage_workshop_path(@event.workshop), class: 'pull-right' %> -

- <%= render 'reruns/meeting_times_list', :rerun => @event, :include_venue => false, :inline => true %> -

-
-

Message Attendees

- -
-
- <%= render 'reruns/message_attendees', :rerun => @event, :url => sms_attendees_path(@event) %> -
-
- <%= render 'messages/form', :message => Message.new(:apropos => @event) %> -
+
+
+ <%= iconic_link_to 'Manage all attendees in series', manage_workshop_path(@event.workshop), class: 'btn btn-sm btn-default', title: 'manage all attendees' , icon: 'group' %> +
+ +

<%= link_to @event.title, @event %>

+

+ <%= render 'reruns/meeting_times_list', :rerun => @event, :include_venue => false, :inline => true %> +

+

hosted by <%= contextualized_user_link(@event.host, :linked => true) %> · + <%= event_price(@event, :show_materials_fee => true) %> · + <%= @event.max_attendees %> slots · + <%= pluralize(@event.attendances.count, 'person') %> signed up
+ meets <%= @event.meetings.count == 1 ? 'once' : (@event.meetings.count == 2 ? 'twice' : pluralize(@event.meetings.count, 'time')) %> · part of the series <%= link_to @event.title, my_workshops_path(:anchor => "w_#{@event.workshop.uuid}") %> +

+
+ +
+
+ +
+
+ <%= render 'manage_attendances' %>
-
-
-
- -
-
- <%= render 'manage_attendances' %> -
-
- <%= render :partial => 'activities/index', :locals => {:activities_n_counts => @activities_n_counts} %> -
+
+ <%= render :partial => 'activities/index', :locals => {:activities_n_counts => @activities_n_counts} %>
+
-<% end %> <%# render :partial => 'events/attend_status_and_call_to_action' %> -
- <%# render :partial => 'activities/index', :locals => {:activities => @event.activities} %> -
+<%# render :partial => 'activities/index', :locals => {:activities => @event.activities} %> + <%# render :partial => 'attendees_modal' %> diff --git a/app/views/events/message.html.erb b/app/views/events/message.html.erb new file mode 100644 index 00000000..970394b0 --- /dev/null +++ b/app/views/events/message.html.erb @@ -0,0 +1,31 @@ +
+
+ <%= iconic_link_to 'Message all attendees in series', message_workshop_path(@event.workshop), class: 'btn btn-sm btn-default', title: 'message all attendees' , icon: 'send' %> +
+ +

<%= link_to @event.title, @event %>

+

+ <%= render 'reruns/meeting_times_list', :rerun => @event, :include_venue => false, :inline => true %> +

+

hosted by <%= contextualized_user_link(@event.host, :linked => true) %> · + <%= event_price(@event, :show_materials_fee => true) %> · + <%= @event.max_attendees %> slots · + <%= pluralize(@event.attendances.count, 'person') %> signed up · + meets <%= @event.meetings.count == 1 ? 'once' : (@event.meetings.count == 2 ? 'twice' : pluralize(@event.meetings.count, 'time')) %>
+ part of the series <%= link_to @event.title, my_workshops_path(:anchor => "w_#{@event.workshop.uuid}") %> +

+
+
+ +
+
+ <%= render 'reruns/message_attendees', :rerun => @event, :url => sms_attendees_path(@event) %> +
+
+ <%= render 'messages/form', :message => Message.new(:apropos => @event) %> +
+
+
diff --git a/app/views/workshops/manage.html.erb b/app/views/workshops/manage.html.erb deleted file mode 100755 index d7d434d8..00000000 --- a/app/views/workshops/manage.html.erb +++ /dev/null @@ -1,85 +0,0 @@ - -
-
- - <%= iconic_link_to 'View', workshop_path(@workshop), :icon => 'calendar-o', :class => 'btn btn-default' %> - <%= iconic_link_to 'Edit', edit_workshop_path(@workshop), :icon => 'pencil', :class => 'btn btn-default' %> - -

Manage

-

<%= @workshop.title %>

-
-
-
-
- <%= image_tag(@workshop.img_src(:large), :class => "img-rounded large_page_thumb full-width") %> -
-
-

- <%= BlueCloth.new(@workshop.description, :filter_html).to_html.html_safe %> -

-
-
-
-

Message All Attendees

-

Send a message to everyone who has ever attended.

- -
-
- <%= render 'reruns/message_attendees', :rerun => @workshop, :url => sms_attendees_workshop_path(@workshop) %> -
-
- <%= render 'messages/form', :message => Message.new(:apropos => @workshop) %> -
-
-
-
- -
-
- <% if @workshop.events.count == 0 %> - None. - <% else %> - <%= render 'reruns/index', :reruns => @workshop.events.ordered_by_first_meeting_start_time.reverse_order, :click_to_show => false, :show_icons => false, :show_manage_buttons => true %> - <% end %> -
-
- - - - - - - - - <% @attendees.each do |user| -%> - <%= render 'users/row', :user => user, :apropos => @workshop %> - <% end %> - -
Name
-
-
-
- -<%= render 'messages/modal_new', :message => Message.new, :to => :one_person %> - - -<% ready_script do -%> - <% if user_signed_in? %> - $('#event_attendees a.message_user').on('click', function(e) { - $('#new_message_modal .modal-header-content').html($(this).data('modal-header-content')); - $('#new_message_modal #message__to_user_uuid').attr('value', $(this).data('id')); - $('#new_message_modal').modal('show'); - e.preventDefault(); - }); - <% end %> - $(document).on('ajax:success', '#new_message_modal form', function(e, data, status, xhr) { - $("#new_message_modal").modal('hide'); - show_bootstrap_alert({text: "Your message has been sent.", type: 'success'}); - }); -<% end -%> \ No newline at end of file diff --git a/app/views/workshops/message.html.erb b/app/views/workshops/message.html.erb new file mode 100644 index 00000000..47a13cbf --- /dev/null +++ b/app/views/workshops/message.html.erb @@ -0,0 +1,38 @@ +
+ +

<%= link_to @workshop.title, my_workshops_path(:anchor => "w_#{@workshop.uuid}") %>

+
+ +
+ +
+
+ <%= render 'reruns/message_attendees', :rerun => @workshop, :url => sms_attendees_workshop_path(@workshop) %> +
+
+ <%= render 'messages/form', :message => Message.new(:apropos => @workshop) %> +
+
+
+<%= render 'messages/modal_new', :message => Message.new, :to => :one_person %> + + +<% ready_script do -%> + <% if user_signed_in? %> + $('#event_attendees a.message_user').on('click', function(e) { + $('#new_message_modal .modal-header-content').html($(this).data('modal-header-content')); + $('#new_message_modal #message__to_user_uuid').attr('value', $(this).data('id')); + $('#new_message_modal').modal('show'); + e.preventDefault(); + }); + <% end %> + $(document).on('ajax:success', '#new_message_modal form', function(e, data, status, xhr) { + $("#new_message_modal").modal('hide'); + show_bootstrap_alert({text: "Your message has been sent.", type: 'success'}); + }); +<% end -%> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 7280ba6a..a738a180 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,11 +4,11 @@ resources :w, controller: 'workshops', as: 'workshops' do member do get 'manage' + get 'message' get 'reruns_partial' match 'upload_photo' post 'auto_add_rerun' get 'simple_index_partial' - get 'manage_attendees' post 'sms_attendees' end end @@ -31,7 +31,12 @@ get 'events/:id/attendees(.:format)' => 'events#attendees', :as => :attendees post 'events/:id/confirm(.:format)' => 'events#confirm', :as => :confirm_attend get 'events/:id/accept_attendee(.:format)' => 'events#accept_attendee', :as => :accept_attendee - get 'events/:id/manage' => 'events#manage_attendees', :as => :manage_event + resources :events, controller: 'events' do + member do + get 'manage' + get 'message' + end + end post 'events/:id/lock' => 'events#lock', :as => :lock_event post 'events/:id/unlock' => 'events#unlock', :as => :unlock_event post 'events/:id/sms_attendees' => 'events#sms_attendees', :as => :sms_attendees