[Ils-source] r1338 - in branches/1.6: . webapp/api/group/put webapp/api/user/put

[scribe at crosswire.org]

Author: scribe
Date: 2015-06-30 02:56:13 -0700 (Tue, 30 Jun 2015)
New Revision: 1338

Modified:
   branches/1.6/
   branches/1.6/webapp/api/group/put/index.jsp
   branches/1.6/webapp/api/user/put/index.jsp
Log:
Merged in fix for user and group to honor action="update"



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337

Modified: branches/1.6/webapp/api/group/put/index.jsp
===================================================================
--- branches/1.6/webapp/api/group/put/index.jsp	2015-06-30 09:40:33 UTC (rev 1337)
+++ branches/1.6/webapp/api/group/put/index.jsp	2015-06-30 09:56:13 UTC (rev 1338)
@@ -73,7 +73,13 @@
 		else {
 			createMode = lookup == null;
 		}
-		if (lookup != null) current = lookup;
+		if (lookup != null) {
+			current = lookup;
+		}
+		else {
+			if (!"update".equals(request.getParameter("action"))) createMode = true;
+			else current = null;
+		}
 	}
 	else {
 		errCode += 2;
@@ -82,6 +88,11 @@
 	}
 
 	errCode += 3;
+	if (current == null) {
+		out.print("<error code=\""+errCode+"\" message=\"Group not found.\"/>");
+		return;
+	}
+	++errCode;
 	if (current.getGroupID() > 0 && adminUser.getUserProfileAccessLevel() <= UserProfile.ACCESS_MANAGER && !adminUser.hasAccess(UserProfile.ACCESS_MODE_USERPR_MODIFY_USER)) {
 		out.print("<error code=\""+errCode+"\" message=\"Permission denied to edit group.\"/>");
 		return;

Modified: branches/1.6/webapp/api/user/put/index.jsp
===================================================================
--- branches/1.6/webapp/api/user/put/index.jsp	2015-06-30 09:40:33 UTC (rev 1337)
+++ branches/1.6/webapp/api/user/put/index.jsp	2015-06-30 09:56:13 UTC (rev 1338)
@@ -84,7 +84,8 @@
 				current = lookup;
 			}
 			else {
-				createMode = true;
+				if (!"update".equals(request.getParameter("action"))) createMode = true;
+				else current = null;
 			}
 		}
 	}