[CS-Project-svn_notify] SF.net SVN: cs-project: [781] trunk/includes/content/settings.inc

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

Revision: 781
          http://cs-project.svn.sourceforge.net/cs-project/?rev=781&view=rev
Author:   crazedsanity
Date:     2008-02-05 18:32:22 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
Extra stuff for handling AJAX stuff (only do extra processing if it's an AJAX request).

Modified Paths:
--------------
    trunk/includes/content/settings.inc

Modified: trunk/includes/content/settings.inc
===================================================================
--- trunk/includes/content/settings.inc	2008-02-06 02:28:04 UTC (rev 780)
+++ trunk/includes/content/settings.inc	2008-02-06 02:32:22 UTC (rev 781)
@@ -277,7 +277,7 @@
 		else {
 			$result = $adminUserClass->remove_user_from_group($uid, $groupId);
 		}
-		$objResponse = regenerate_group_lists($groupId);
+		regenerate_group_lists($groupId, $objResponse);
 		
 		$msg = array(
 			'title'		=> "Update Complete",
@@ -305,7 +305,7 @@
 }//end ajax__group_user()
 
 
-function regenerate_group_lists($groupId) {
+function regenerate_group_lists($groupId, xajaxResponse &$objResponse=NULL) {
 	$user = $GLOBALS['objects']['user'];
 	$page = $GLOBALS['objects']['page'];
 	$page->ui = new sessionCache("/userInput/content");
@@ -417,28 +417,31 @@
 		);
 		$page->set_message_wrapper($msg);
 	}
-	$ajax_nonUsers = mini_parser(
-		$page->templateRows['group_nonMembers'],
-		array(
-			'show_group_list__removeUser'		=> $removeUsersRow,
-			'show_group_list__noRemoveUser'	=> ""
-		),
-		'{', '}'
-	);
 	
-	$ajax_curUsers = mini_parser(
-		$page->templateRows['group_currentMembers'],
-		array(
-			'show_group_list__selectUser'		=> $addUsersRow,
-			'show_group_list__noUser'			=> ""
-		),
-		'{', '}'
-	);
+	if(!is_null($objResponse)) {
+		$ajax_nonUsers = mini_parser(
+			$page->templateRows['group_nonMembers'],
+			array(
+				'show_group_list__removeUser'		=> $removeUsersRow,
+				'show_group_list__noRemoveUser'	=> ""
+			),
+			'{', '}'
+		);
+		
+		$ajax_curUsers = mini_parser(
+			$page->templateRows['group_currentMembers'],
+			array(
+				'show_group_list__selectUser'		=> $addUsersRow,
+				'show_group_list__noUser'			=> ""
+			),
+			'{', '}'
+		);
+		
+		$objResponse->addAssign('group_currentMembers', 'innerHTML', $ajax_curUsers);
+		$objResponse->addAssign('group_nonMembers', 'innerHTML', $ajax_nonUsers);
+		$objResponse->addAssign('MAIN_error_message', 'innerHTML', $page->process_set_message());
+	}
 	
-	$objResponse->addAssign('group_currentMembers', 'innerHTML', $ajax_curUsers);
-	$objResponse->addAssign('group_nonMembers', 'innerHTML', $ajax_nonUsers);
-	$objResponse->addAssign('MAIN_error_message', 'innerHTML', $page->process_set_message());
-	
 	return($objResponse);
 }//end regenerate_group_lists()
 ?>


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