From 688d933df710153062d09b0af05377f2b58e43a2 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 3 Nov 2015 16:39:54 -0500
Subject: [PATCH] fixed admin organization association text

---
 awx/ui/client/src/widgets/Stream.js | 61 +++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/widgets/Stream.js b/awx/ui/client/src/widgets/Stream.js
index 2e5a788b9f..5cbd299edf 100644
--- a/awx/ui/client/src/widgets/Stream.js
+++ b/awx/ui/client/src/widgets/Stream.js
@@ -221,15 +221,68 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
             if (obj2_obj && obj2_obj.name && !/^_delete/.test(obj2_obj.name)) {
                 obj2_obj.base = obj2;
                 obj2_obj.name = $filter('sanitize')(obj2_obj.name);
-                descr += obj2 + " <a href=\"" + BuildUrl(obj2_obj) + "\">" + obj2_obj.name + '</a>' + ((activity.operation === 'disassociate') ? ' from ' : ' to ');
-                descr_nolink += obj2 + ' ' + obj2_obj.name + ((activity.operation === 'disassociate') ? ' from ' : ' to ');
+                descr += obj2 +
+                    " <a href=\"" + BuildUrl(obj2_obj) + "\">" +
+                    obj2_obj.name + '</a>';
+                if (activity.object_association === 'admins') {
+                    if (activity.operation === 'disassociate') {
+                        descr += ' from being an admin of ';
+                    } else {
+                        descr += ' as an admin of ';
+                    }
+                } else {
+                    if (activity.operation === 'disassociate') {
+                        descr += ' from ';
+                    } else {
+                        descr += ' to ';
+                    }
+                }
+                descr_nolink += obj2 + ' ' + obj2_obj.name;
+                if (activity.object_association === 'admins') {
+                    if (activity.operation === 'disassociate') {
+                        descr_nolink += ' from being an admin of ';
+                    } else {
+                        descr_nolink += ' as an admin of ';
+                    }
+                } else {
+                    if (activity.operation === 'disassociate') {
+                        descr_nolink += ' from ';
+                    } else {
+                        descr_nolink += ' to ';
+                    }
+                }
             } else if (obj2) {
                 name = '';
                 if (obj2_obj && obj2_obj.name) {
                     name = ' ' + stripDeleted(obj2_obj.name);
                 }
-                descr += obj2 + name + ((activity.operation === 'disassociate') ? ' from ' : ' to ');
-                descr_nolink += obj2 + name + ((activity.operation === 'disassociate') ? ' from ' : ' to ');
+                if (activity.object_association === 'admins') {
+                    if (activity.operation === 'disassociate') {
+                        descr += ' from being an admin of ';
+                    } else {
+                        descr += ' as an admin of ';
+                    }
+                } else {
+                    if (activity.operation === 'disassociate') {
+                        descr += ' from ';
+                    } else {
+                        descr += ' to ';
+                    }
+                }
+                descr_nolink += obj2 + ' ' + obj2_obj.name;
+                if (activity.object_association === 'admins') {
+                    if (activity.operation === 'disassociate') {
+                        descr_nolink += ' from being an admin of ';
+                    } else {
+                        descr_nolink += ' as an admin of ';
+                    }
+                } else {
+                    if (activity.operation === 'disassociate') {
+                        descr_nolink += ' from ';
+                    } else {
+                        descr_nolink += ' to ';
+                    }
+                }
             }
             if (obj1_obj && obj1_obj.name && !/^\_delete/.test(obj1_obj.name)) {
                 obj1_obj.base = obj1;