You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2011/05/27 15:14:05 UTC

svn commit: r1128294 - /incubator/vcl/trunk/web/.ht-inc/groups.php

Author: jfthomps
Date: Fri May 27 13:14:05 2011
New Revision: 1128294

URL: http://svn.apache.org/viewvc?rev=1128294&view=rev
Log:
VCL-456

modified editOrAddGroup - moved setting 'groupwasnone' for continuation data from definition of $cdata to adding it only if type is user

Modified:
    incubator/vcl/trunk/web/.ht-inc/groups.php

Modified: incubator/vcl/trunk/web/.ht-inc/groups.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/groups.php?rev=1128294&r1=1128293&r2=1128294&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/groups.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/groups.php Fri May 27 13:14:05 2011
@@ -414,13 +414,14 @@ function editOrAddGroup($state) {
 			print "    <TH align=right>Editable by:</TH>\n";
 			print "    <TD valign=\"top\">\n";
 			$groupwasnone = 0;
-			if($submitErr & EDITGROUPERR)
+			if($submitErr & EDITGROUPERR) {
 				if($state == 0)
 					$data['editgroupid'] = $usergroups[$data['groupid']]['editgroupid'];
 				else {
 					$tmp = array_keys($affilusergroups);
 					$data['editgroupid'] = $tmp[0];
 				}
+			}
 			$notice = '';
 			if($state == 0 && empty($usergroups[$data['groupid']]["editgroup"])) {
 				$affilusergroups = array_reverse($affilusergroups, TRUE);
@@ -507,12 +508,13 @@ function editOrAddGroup($state) {
 		else {
 			$cdata = array('type' => $data['type'],
 			               'groupid' => $data['groupid'],
-			               'isowner' => $data['isowner'],
-			               'groupwasnone' => $groupwasnone);
+			               'isowner' => $data['isowner']);
 			if($data['type'] == 'resource')
 				$cdata['resourcetypeid'] = $resourcetypeid;
-			else
+			else {
 				$cdata['selectAffil'] = $selectAffil;
+				$cdata['groupwasnone'] = $groupwasnone;
+			}
 			$cont = addContinuationsEntry('confirmEditGroup', $cdata);
 			print "      <INPUT type=hidden name=continuation value=\"$cont\">\n";
 			print "      <INPUT type=submit value=\"Confirm Changes\">\n";