Changeset 15

Timestamp:

01/22/06 23:16:18

Author:

johnsa

Message:

added "notFound" return to PEFetchAuthAction with appropriate error message (userid not found); modified error message for notFound return of prefs fetch action to reflect the same.

Files:

• trunk/calendar3/webadmin/src/org/bedework/webadmin/authuser/PEFetchAuthAction.java (modified) (2 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/FetchPrefsAction.java (modified) (1 diff)

trunk/calendar3/webadmin/src/org/bedework/webadmin/authuser/PEFetchAuthAction.java

@@ -69 +69 @@
- * <p>Forwards to:<ul>
- *      <li>"noAccess"     user not authorised.</li>
-event
+user
- *      <li>"continue"     continue on to update page.</li>
- * </ul>
@@ -96 +96 @@
-    BwAuthUser au = svci.getUserAuth().getUser(userid);
-
+    if (au == null) {
+      form.getErr().emit("org.bedework.userid.notfound", userid);
+      return "notFound";
+    }
+    
-    if (debug) {
-      logIt("Retrieved auth user " + au);

trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/FetchPrefsAction.java

@@ -103 +103 @@
-      BwUser user = svc.findUser(str);
-      if (user == null) {
-client
+userid
-        return "notFound";
-      }