chg: rephrase wording to make clear that OrgAdmin works on behalf of org

Change-Id: I88fd5eee6250f68c32e7de7945b14c0f66dd29ea

diff --git a/src/club/wpia/gigi/util/AuthorizationContext.java b/src/club/wpia/gigi/util/AuthorizationContext.java
index 5d70b38205b4baed17a023d6670f0e33753f89c8..13f70cc7c96c088c301d6a9c618ce152048fc586 100644 (file)
--- a/src/club/wpia/gigi/util/AuthorizationContext.java
+++ b/src/club/wpia/gigi/util/AuthorizationContext.java
@@ -80,7 +80,7 @@ public class AuthorizationContext implements Outputable, Serializable {
 
     private static final SprintfCommand sp = new SprintfCommand("Logged in as {0} via {1}.", Arrays.asList("${username", "${loginMethod"));
 
-    private static final SprintfCommand inner = new SprintfCommand("{0} (on behalf of {1})", Arrays.asList("${user", "${target"));
+    private static final SprintfCommand inner = new SprintfCommand("{0}, acting as {1},", Arrays.asList("${user", "${target"));
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
@@ -90,8 +90,8 @@ public class AuthorizationContext implements Outputable, Serializable {
             @Override
             public void output(PrintWriter out, Language l, Map<String, Object> vars) {
                 if (target != actor) {
-                    vars.put("user", ((Organisation) target).getName().toString());
-                    vars.put("target", actor.getPreferredName().toString());
+                    vars.put("target", ((Organisation) target).getName().toString());
+                    vars.put("user", actor.getPreferredName().toString());
                     inner.output(out, l, vars);
                 } else {
                     out.println(actor.getPreferredName().toString());

diff --git a/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java b/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java
index 94586e3452de2558126cf0113ba42a2b41264338..122ed18b99127f6f367b9eaf425ff38d5fe17e08 100644 (file)
--- a/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java
+++ b/tests/club/wpia/gigi/pages/orga/TestOrgSwitch.java
@@ -49,7 +49,7 @@ public class TestOrgSwitch extends OrgTest {
         assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org1.getId() + "=y", 0));
 
         String res = IOUtils.readURL(get(SwitchOrganisation.PATH));
-        assertThat(res, containsString("Logged in as " + org1.getName() + " (on behalf of " + u2.getPreferredName()));
+        assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org1.getName()));
 
     }
 
@@ -83,7 +83,7 @@ public class TestOrgSwitch extends OrgTest {
         assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org2.getId() + "=y", 0));
 
         String res = IOUtils.readURL(get(SwitchOrganisation.PATH));
-        assertThat(res, containsString("Logged in as " + org2.getName() + " (on behalf of " + u2.getPreferredName()));
+        assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org2.getName()));
 
     }
 
@@ -94,7 +94,7 @@ public class TestOrgSwitch extends OrgTest {
         assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org1.getId() + "=y", 0));
 
         String res = IOUtils.readURL(get(SwitchOrganisation.PATH));
-        assertThat(res, containsString("Logged in as " + org1.getName() + " (on behalf of " + u2.getPreferredName()));
+        assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org1.getName()));
 
     }