Commit 7713f7fe authored by Valery Sizov's avatar Valery Sizov

Notification refactoring

parent f7859ec1
...@@ -27,7 +27,6 @@ class Admin::UsersController < ApplicationController ...@@ -27,7 +27,6 @@ class Admin::UsersController < ApplicationController
respond_to do |format| respond_to do |format|
if @admin_user.save if @admin_user.save
Notify.new_user_email(@admin_user, params[:user][:password]).deliver
format.html { redirect_to [:admin, @admin_user], notice: 'User was successfully created.' } format.html { redirect_to [:admin, @admin_user], notice: 'User was successfully created.' }
format.json { render json: @admin_user, status: :created, location: @admin_user } format.json { render json: @admin_user, status: :created, location: @admin_user }
else else
......
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :set_current_user_for_mailer
protect_from_forgery protect_from_forgery
helper_method :abilities, :can? helper_method :abilities, :can?
...@@ -19,6 +20,10 @@ class ApplicationController < ActionController::Base ...@@ -19,6 +20,10 @@ class ApplicationController < ActionController::Base
end end
end end
def set_current_user_for_mailer
MailerObserver.current_user = current_user
end
def abilities def abilities
@abilities ||= Six.new @abilities ||= Six.new
end end
......
...@@ -67,10 +67,7 @@ class IssuesController < ApplicationController ...@@ -67,10 +67,7 @@ class IssuesController < ApplicationController
def create def create
@issue = @project.issues.new(params[:issue]) @issue = @project.issues.new(params[:issue])
@issue.author = current_user @issue.author = current_user
@issue.save
if @issue.save && @issue.assignee != current_user
Notify.new_issue_email(@issue).deliver
end
respond_with(@issue) respond_with(@issue)
end end
......
...@@ -12,10 +12,8 @@ class NotesController < ApplicationController ...@@ -12,10 +12,8 @@ class NotesController < ApplicationController
def create def create
@note = @project.notes.new(params[:note]) @note = @project.notes.new(params[:note])
@note.author = current_user @note.author = current_user
@note.notify = true if params[:notify] == '1'
if @note.save @note.save
notify if params[:notify] == '1'
end
respond_to do |format| respond_to do |format|
format.html {redirect_to :back} format.html {redirect_to :back}
...@@ -35,22 +33,4 @@ class NotesController < ApplicationController ...@@ -35,22 +33,4 @@ class NotesController < ApplicationController
end end
end end
protected
def notify
@project.users.reject { |u| u.id == current_user.id } .each do |u|
case @note.noteable_type
when "Commit" then
Notify.note_commit_email(u, @note).deliver
when "Issue" then
Notify.note_issue_email(u, @note).deliver
when "MergeRequest"
true # someone should write email notification
when "Snippet"
true
else
Notify.note_wall_email(u, @note).deliver
end
end
end
end end
class MailerObserver < ActiveRecord::Observer
observe :issue, :user, :note, :snippet
cattr_accessor :current_user
def after_create(model)
new_issue(model) if model.kind_of?(Issue)
new_user(model) if model.kind_of?(User)
new_note(model) if model.kind_of?(Note)
end
protected
def new_issue(issue)
if issue.assignee != current_user
Notify.new_issue_email(issue).deliver
end
end
def new_user(user)
Notify.new_user_email(user, user.password).deliver
end
def new_note(note)
return unless note.notify
note.project.users.reject { |u| u.id == current_user.id } .each do |u|
case note.noteable_type
when "Commit" then
Notify.note_commit_email(u, note).deliver
when "Issue" then
Notify.note_issue_email(u, note).deliver
when "MergeRequest"
true # someone should write email notification
when "Snippet"
true
else
Notify.note_wall_email(u, note).deliver
end
end
end
end
...@@ -13,6 +13,7 @@ class Note < ActiveRecord::Base ...@@ -13,6 +13,7 @@ class Note < ActiveRecord::Base
:prefix => true :prefix => true
attr_protected :author, :author_id attr_protected :author, :author_id
attr_accessor :notify
validates_presence_of :project validates_presence_of :project
...@@ -35,6 +36,10 @@ class Note < ActiveRecord::Base ...@@ -35,6 +36,10 @@ class Note < ActiveRecord::Base
scope :inc_author, includes(:author) scope :inc_author, includes(:author)
mount_uploader :attachment, AttachmentUploader mount_uploader :attachment, AttachmentUploader
def notify
@notify ||= false
end
end end
# == Schema Information # == Schema Information
# #
......
...@@ -23,7 +23,7 @@ module Gitlab ...@@ -23,7 +23,7 @@ module Gitlab
# config.plugins = [ :exception_notification, :ssl_requirement, :all ] # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
# Activate observers that should always be running. # Activate observers that should always be running.
# config.active_record.observers = :cacher, :garbage_collector, :forum_observer config.active_record.observers = :mailer_observer
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment