[CS-Project-svn_notify] SF.net SVN: cs-project: [784] trunk

[<cra...@us...>]

Revision: 784
          http://cs-project.svn.sourceforge.net/cs-project/?rev=784&view=rev
Author:   crazedsanity
Date:     2008-02-05 19:30:42 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
Updates leader of current group when it's changed... NOTE: updating leader doesn't work anymore...

Modified Paths:
--------------
    trunk/includes/content/settings.inc
    trunk/templates/content/settings/index.content.tmpl

Modified: trunk/includes/content/settings.inc
===================================================================
--- trunk/includes/content/settings.inc	2008-02-06 02:50:55 UTC (rev 783)
+++ trunk/includes/content/settings.inc	2008-02-06 03:30:42 UTC (rev 784)
@@ -193,6 +193,7 @@
 			}
 			$page->ui->set_cache("settings/showGroup", $showGroup);
 			regenerate_group_lists($showGroup);
+			display_current_leader($showGroup);
 		}
 	}
 }
@@ -312,7 +313,6 @@
 		//now show all the users (if there are any) associated with that group.
 		$groupData = $adminUserClass->get_group_user($groupId);
 		$page->add_template_var('groupId', $groupId);
-		$page->add_template_var('currentGroupLeader', $allUsers[$myGroupData['leader_uid']]['username']);
 					
 		$addUsers = 0;
 		$removeUsers = 0;
@@ -343,11 +343,6 @@
 				}
 			}
 			
-			
-			//set the option list for changing the leader!
-			$changeLeaderOption = array_as_option_list($changeLeaderOptionArr, $myGroupData['leader_uid']);
-			$page->add_template_var('changeGroupLeader_list', $changeLeaderOption);
-			
 			if($removeUsers) {
 				//show 'em the list to be removed.
 				$page->add_template_var('show_group_list__removeUser', $removeUsersRow);
@@ -423,6 +418,55 @@
 	$cache = new sessionCache("/userInput/content");
 	$cache->set_cache("settings/showGroup", $groupId);
 	$objResponse = regenerate_group_lists($groupId);
+	
+	//update the current leader.
+	$curLeaderInfo = display_current_leader($groupId, TRUE);
+	$objResponse->addAssign('currentGroupLeader', 'innerHTML', $curLeaderInfo);
+	
 	return($objResponse);
 }//end ajax__change_current_group()
+
+
+function display_current_leader($groupId, $isAjaxCall=FALSE) {
+	$user = $GLOBALS['objects']['user'];
+	$page = $GLOBALS['objects']['page'];
+	$adminUserClass = $GLOBALS['objects']['admin'];
+	$allUsers = $adminUserClass->get_users();
+	
+	$allGroupData = $adminUserClass->get_groups(FALSE);
+	$myGroupData = $allGroupData[$groupId];
+	#$page->add_template_var('currentGroupLeader', $allUsers[$myGroupData['leader_uid']]['username']);
+	
+			
+	$changeLeaderOptionArr = array();
+	$groupData = $adminUserClass->get_group_user($groupId);
+	
+	foreach($allUsers as $uid=>$userData) {
+		if(isset($groupData[$uid])) {
+			$changeLeaderOptionArr[$uid] = $userData['username'];
+		}
+	}
+	
+	//set the option list for changing the leader!
+	$changeLeaderOption = array_as_option_list($changeLeaderOptionArr, $myGroupData['leader_uid']);
+	$page->add_template_var('changeGroupLeader_list', $changeLeaderOption);
+	
+	$addTemplateVars = array(
+		'currentGroupLeader'		=> $allUsers[$myGroupData['leader_uid']]['username'],
+		'changeGroupLeader_list'	=> $changeLeaderOption
+	);
+	
+	
+	if($isAjaxCall) {
+		$retval = $page->templateRows['currentGroupLeaderBox'];
+		$retval = mini_parser($retval, $addTemplateVars, '{', '}');
+		return($retval);
+	}
+	else {
+		foreach($addTemplateVars as $name=>$value) {
+			$page->add_template_var($name, $value);
+		}
+		$page->add_template_var('currentGroupLeaderBox', $page->templateRows['currentGroupLeaderBox']);
+	}
+}//end display_current_leader()
 ?>

Modified: trunk/templates/content/settings/index.content.tmpl
===================================================================
--- trunk/templates/content/settings/index.content.tmpl	2008-02-06 02:50:55 UTC (rev 783)
+++ trunk/templates/content/settings/index.content.tmpl	2008-02-06 03:30:42 UTC (rev 784)
@@ -111,11 +111,15 @@
 				<option onClick="javascript:void(xajax_ajax__change_current_group(%%group_id%%))" %%selectedString%%>%%display%% (%%short_name%%)</option>
 <!-- END show_group_list -->
 			</SELECT><BR><BR><hr>
+			<div id="currentGroupLeader">
+<!-- BEGIN currentGroupLeaderBox -->
 			<b>Change Leader </b>({currentGroupLeader})<b> to:</b> 
 			<input name="changeLeader[groupId]" type="HIDDEN" value="{groupId}">
 			<SELECT name="changeLeader[newLeader]">
 				{changeGroupLeader_list}
 			</SELECT><BR>
+<!-- END currentGroupLeaderBox -->
+			</div>
 			<input type="submit" value="Change Leader" onClick="this.form.action.value='changeLeader'">
 		</td>
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.