gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add comment functionality to tracks

Browse source
This commit is contained in:
Rishabh Singh 2019-07-18 12:49:50 +05:30
parent 770a63e15c
commit 58208c73ac
19 changed files with 153 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/comments_controller.rb
View file

@ -17,12 +17,12 @@ module Admin
private
# Returning all available comments, ordered by created_at: :desc and by event.title
# Returning all available comments, ordered by created_at: :desc
def accessible_ordered_comments
Comment.accessible_by(current_ability).joins('INNER JOIN events ON commentable_id = events.id').order('events.title', 'comments.created_at DESC')
Comment.accessible_by(current_ability).order('comments.created_at DESC')
end
# Grouping all comments by conference, and by event. It returns {:conference => {:event => [{comment_2}, {comment_1 }]}}
# Grouping all comments by conference, and by commentable obj. It returns {:conference => {:commentable => [{comment_2}, {comment_1 }]}}
def grouped_comments(remarks)
remarks.group_by{ |comment| comment.commentable.program.conference }.map {|conference, comments| [conference, comments.group_by{|comment| comment.commentable}]}.to_h
end

22
app/controllers/admin/tracks_controller.rb
View file

@ -30,6 +30,9 @@ module Admin
end
def show
@comments = @track.root_comments
@comment_count = @track.comment_threads.count
respond_to do |format|
format.html { render }
format.json { render json: @conference.tracks.to_json }
@ -53,7 +56,20 @@ module Admin
end
end
def edit; end
def edit
@comments = @track.root_comments
@comment_count = @track.comment_threads.count
end
def comment
comment = Comment.new(comment_params)
comment.commentable = @track
comment.user_id = current_user.id
comment.save!
comment.move_to_child_of(params[:parent]) unless params[:parent].nil?
redirect_to admin_conference_program_track_path(@conference.short_title, @track)
end
def update
if @track.update_attributes(track_params)
@ -139,6 +155,10 @@ module Admin
params.require(:track).permit(:name, :description, :color, :short_name, :cfp_active, :start_date, :end_date, :room_id)
end
def comment_params
params.require(:comment).permit(:commentable, :body, :user_id)
end
def update_state(transition, notice)
errors = @track.update_state(transition)

20
app/mailers/mailbot.rb
View file

@ -128,13 +128,19 @@ class Mailbot < ActionMailer::Base
def event_comment_mail(comment, user)
@comment = comment
@event = @comment.commentable
@conference = @event.program.conference
@commentable = @comment.commentable
@conference = @commentable.program.conference
@user = user
mail(to: @user.email,
from: @conference.contact.email,
template_name: 'comment_template',
subject: "New comment has been posted for #{@event.title}")
if @comment.commentable_type == 'Event'
mail(to: @user.email,
from: @conference.contact.email,
template_name: 'comment_event_template',
subject: "New comment has been posted for #{@commentable.title}")
elsif @comment.commentable_type == 'Track'
mail(to: @user.email,
from: @conference.contact.email,
template_name: 'comment_track_template',
subject: "New comment has been posted for #{@commentable.short_name}")
end
end
end

10
app/models/ability.rb
View file

@ -155,15 +155,17 @@ class Ability
can :manage, Registration, conference_id: conf_ids_for_organizer
# To access conference/proposals
can :manage, Event, program: { conference_id: conf_ids_for_organizer }
can :manage, Comment
# To access comment link in menu bar
can :index, Comment, commentable_type: 'Event',
commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_organizer).pluck(:id)).pluck(:id)
# can :index, Comment, commentable_type: 'Event',
# commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_organizer).pluck(:id)).pluck(:id)
end
if conf_ids_for_cfp
# To access comment link in menu bar
can :index, Comment, commentable_type: 'Event',
commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id)
can :manage, Comment
# can :index, Comment, commentable_type: 'Event',
# commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id)
# To access conference/proposals
can :manage, Event, program: { conference_id: conf_ids_for_cfp }
end

7
app/models/admin_ability.rb
View file

@ -102,6 +102,7 @@ class AdminAbility
signed_in_with_organizer_role(user, conf_ids_for_organization_admin)
end
# rubocop:disable Metrics/AbcSize
def signed_in_with_organizer_role(user, conf_ids_for_organization_admin = [])
# ids of all the conferences for which the user has the 'organizer' role and
# conferences that belong to organizations for which user is 'organization_admin'
@ -149,7 +150,8 @@ class AdminAbility
end
can :index, Comment, commentable_type: 'Event',
commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids).pluck(:id)).pluck(:id)
can :index, Comment, commentable_type: 'Track',
commentable_id: Track.where(program_id: Program.where(conference_id: conf_ids).pluck(:id)).pluck(:id)
# Abilities for Role (Conference resource)
can [:index, :show], Role do |role|
role.resource_type == 'Conference' || role.resource_type == 'Track'
@ -163,6 +165,7 @@ class AdminAbility
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, item_type: 'User'
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, conference_id: conf_ids
end
# rubocop:enable Metrics/AbcSize
def signed_in_with_cfp_role(user)
# ids of all the conferences for which the user has the 'cfp' role
@ -189,6 +192,8 @@ class AdminAbility
can :index, Comment, commentable_type: 'Event',
commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id)
can :index, Comment, commentable_type: 'Track',
commentable_id: Track.where(program_id: Program.where(conference_id: conf_ids).pluck(:id)).pluck(:id)
# Abilities for Role (Conference resource)
can [:index, :show], Role do |role|
role.resource_type == 'Conference' || role.resource_type == 'Track'

2
app/models/track.rb
View file

@ -15,6 +15,8 @@ class Track < ApplicationRecord
has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
acts_as_commentable
before_create :generate_guid
validates :name, presence: true
validates :color, format: /\A#[0-9A-F]{6}\z/

9
app/views/admin/comments/_all_comments.html.haml
View file

@ -1,11 +1,14 @@
- @comments.each do |conference, events|
- @comments.each do |conference, objects|
.panel.panel-default
.panel-heading
%h4.title.panel-title= conference.title
.panel-body
- events.each do |event, comments|
- objects.each do |obj, comments|
.notifications
%h4.title= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
- if obj.class.name == 'Event'
%h4.title= link_to obj.title, admin_conference_program_event_path(obj.program.conference.short_title, obj)
- if obj.class.name == 'Track'
%h4.title= link_to obj.name, admin_conference_program_track_path(obj.program.conference.short_title, obj)
%hr
- comments.each do |comment|
%h5.strong Posted by: #{comment.user.name} | Created at: #{comment.created_at}

9
app/views/admin/comments/_posted_comments.html.haml
View file

@ -1,11 +1,14 @@
- @posted_comments.each do |conference, events|
- @posted_comments.each do |conference, objects|
.panel.panel-default
.panel-heading
%h4.title.panel-title= conference.title
.panel-body
- events.each do |event, comments|
- objects.each do |obj, comments|
.notifications
%h4.title= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
- if obj.class.name == 'Event'
%h4.title= link_to obj.title, admin_conference_program_event_path(obj.program.conference.short_title, obj)
- if obj.class.name == 'Track'
%h4.title= link_to obj.name, admin_conference_program_track_path(obj.program.conference.short_title, obj)
%hr
- comments.each do |comment|
%h5.strong Created at: #{comment.created_at}

9
app/views/admin/comments/_unread_comments.html.haml
View file

@ -1,11 +1,14 @@
- @unread_comments.each do |conference, events|
- @unread_comments.each do |conference, objects|
.panel.panel-default
.panel-heading
%h4.title.panel-title= conference.title
.panel-body
- events.each do |event, comments|
- objects.each do |obj, comments|
.notifications
%h4.title= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
- if obj.class.name == 'Event'
%h4.title= link_to obj.title, admin_conference_program_event_path(obj.program.conference.short_title, obj)
- if obj.class.name == 'Track'
%h4.title= link_to obj.name, admin_conference_program_track_path(obj.program.conference.short_title, obj)
%hr
- comments.each do |comment|
%h5.strong Posted by: #{comment.user.name} | Created at: #{comment.created_at}

15
app/views/admin/tracks/_nested_comments.html.haml Normal file
View file

@ -0,0 +1,15 @@
%div{ style: "padding-left:#{padding}px" }
.well.comment-section
%strong= comment.user.name
%i= comment.created_at
%p.comment-body= comment.body
%div
%a.pull-right.comment-reply-link{ href: '#' } Reply
.comment-reply
= semantic_form_for :comment, url: comment_admin_conference_program_track_path(@conference.short_title, @track.short_name, comment.commentable_id), method: :post do |f|
= f.input :body
%input{ name: 'parent', type: 'hidden', value: comment.id }
%input{ name: 'authenticity_token', type: 'hidden', value: '#{form_authenticity_token}' }
%button.btn.btn-primary.pull-right{ name: 'button', type: 'submit' } Add Reply
- comment.children.each do |child|
= render 'nested_comments', comment: child, padding: 50

18
app/views/admin/tracks/show.html.haml
View file

@ -127,3 +127,21 @@
= event.state
%td
= event.time
.row
= link_to "Comments (#{@comment_count})", '#', id: 'event-comment-link'
#comments-div
%hr
%ul.media
%div
.row-fluid
= semantic_form_for :comment, url: comment_admin_conference_program_track_path(@conference.short_title, @track.short_name), method: :post do |f|
= f.input :body
= f.submit 'Add Comment', class: 'btn btn-primary pull-right'
%br
%br
- @comments.each do |comment|
%div
= render partial: 'nested_comments', locals: { comment: comment, padding: 0}

7
app/views/layouts/_user_menu.html.haml
View file

@ -4,8 +4,11 @@
Notifications (#{unread_notifications(current_user).length})
- if unread_notifications(current_user).length > 0
%li.dropdown-header Last 5 Comments for:
- unread_notifications(current_user).limit(5).group_by{ |comment| comment.commentable}.each do |event, comments|
%li= link_to("#{event.title}(#{comments.count})", admin_conference_program_event_path(event.program.conference.short_title, event.id))
- unread_notifications(current_user).limit(5).group_by{ |comment| comment.commentable}.each do |obj, comments|
- if obj.class.name === 'Event'
%li= link_to("#{obj.title}(#{comments.count})", admin_conference_program_event_path(obj.program.conference.short_title, obj.id))
- if obj.class.name === 'Track'
%li= link_to("#{obj.name}(#{comments.count})", admin_conference_program_track_path(obj.program.conference.short_title, obj))
%li.divider
%li= link_to "See all unread Comments (#{unread_notifications(current_user).length})", admin_comments_path
%li= link_to 'See all Comments', admin_comments_path(anchor: 'all_comments')

4
app/views/mailbot/comment_template.text.erb → app/views/mailbot/comment_event_template.text.erb
View file

@ -1,10 +1,10 @@
Dear <%= @user.name %>,
User <%= @comment.user.name %> posted a new comment for event <%= @event.title %> of <%= @conference.short_title %> .
User <%= @comment.user.name %> posted a new comment for event <%= @commentable.title %> of <%= @conference.short_title %> .
"<%= @comment.body %>"
To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @commentable, only_path: false)) %>
Best wishes,
<%= @conference.title %> Team

10
app/views/mailbot/comment_track_template.text.erb Normal file
View file

@ -0,0 +1,10 @@
Dear <%= @user.name %>,
User <%= @comment.user.name %> posted a new comment for track <%= @commentable.short_name %> of <%= @conference.short_title %> .
"<%= @comment.body %>"
To reply to this comment, please go to <%= h(admin_conference_program_track_url(@conference.short_title, @commentable, only_path: false)) %>
Best wishes,
<%= @conference.title %> Team