From 6f1c9ffb810c435995054df031cc2bea90348712 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Tue, 8 Nov 2016 11:20:14 +0100
Subject: [PATCH] refactoring

---
 app/helpers/notifications_helper.rb | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index c61b78276..cbb44fd6f 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -20,18 +20,15 @@ module NotificationsHelper
 
   def generate_notification(user, target_user, org, role, project)
     if org
-      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)
-      else
-        title = I18n.t('notifications.unassign_user_from_organization',
-                       unassigned_user: target_user.name,
-                       organization: org.name,
-                       unassigned_by_user: user.name)
-      end
+      title = I18n.t('notifications.unassign_user_from_organization',
+                     unassigned_user: target_user.name,
+                     organization: org.name,
+                     unassigned_by_user: user.name)
+      title = I18n.t('notifications.assign_user_to_organization',
+                     assigned_user: target_user.name,
+                     role: role,
+                     organization: org.name,
+                     assigned_by_user: user.name) if role
       message = "#{I18n.t('search.index.organization')} #{org.name}"
     elsif project
       title = I18n.t('activities.unassign_user_from_project',