From 749b1089285e9dcee175077fc67cf5fbf4848dbf Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 2 Nov 2016 13:32:15 +0100 Subject: [PATCH] fix hound --- app/controllers/user_projects_controller.rb | 10 ++++----- app/controllers/users/settings_controller.rb | 22 ++++++++++---------- app/models/activity.rb | 3 ++- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/controllers/user_projects_controller.rb b/app/controllers/user_projects_controller.rb index c736795cf..fb5aee4b4 100644 --- a/app/controllers/user_projects_controller.rb +++ b/app/controllers/user_projects_controller.rb @@ -277,12 +277,10 @@ class UserProjectsController < ApplicationController end def generate_notification(user, target_user, project) - title = I18n.t( - "activities.unassign_user_from_project", - unassigned_user: target_user.full_name, - project: project.name, - unassigned_by_user: user.full_name - ) + title = I18n.t('activities.unassign_user_from_project', + unassigned_user: target_user.full_name, + project: project.name, + unassigned_by_user: user.full_name) message = "#{I18n.t('search.index.project')} #{@project.name}" notification = Notification.create( type_of: :assignment, diff --git a/app/controllers/users/settings_controller.rb b/app/controllers/users/settings_controller.rb index d3d5e03f9..c84c02620 100644 --- a/app/controllers/users/settings_controller.rb +++ b/app/controllers/users/settings_controller.rb @@ -410,9 +410,9 @@ class Users::SettingsController < ApplicationController flash.keep(:notice) end generate_notification(@user_organization.user, - @user_org.user, - @user_org.organization, - false) + @user_org.user, + @user_org.organization, + false) format.json { render json: { status: :ok @@ -585,15 +585,15 @@ class Users::SettingsController < ApplicationController def generate_notification(user, target_user, org, role) if role title = I18n.t('notifications.assign_user_to_organization', - assigned_user: target_user.name, - role: role, - organization: org.name, - assigned_by_user: user.name) + assigned_user: target_user.name, + role: role, + organization: org.name, + assigned_by_user: user.name) else title = I18n.t('notifications.unassign_user_from_organization', - unassigned_user: target_user.name, - organization: org.name, - unassigned_by_user: user.name) + unassigned_user: target_user.name, + organization: org.name, + unassigned_by_user: user.name) end message = "#{I18n.t('search.index.organization')} #{org.name}" @@ -602,7 +602,7 @@ class Users::SettingsController < ApplicationController title: ActionController::Base.helpers.sanitize(title), message: - ActionController::Base.helpers.sanitize(message), + ActionController::Base.helpers.sanitize(message) ) if target_user.assignments_notification diff --git a/app/models/activity.rb b/app/models/activity.rb index c1f3d3dd7..975038437 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -54,7 +54,8 @@ class Activity < ActiveRecord::Base private def generate_notification - if %w(assign_user_to_project assign_user_to_module unassign_user_from_module).include? type_of + if %w(assign_user_to_project + assign_user_to_module unassign_user_from_module).include? type_of notification_type = :assignment else notification_type = :recent_changes