Revert "improved messaging in bulk user tools + added bulk group add/…

…remove"

This reverts commit feff53e.

web/concrete/elements/users/search_results.php

@@ -34,9 +34,6 @@
 					<option value="properties"><?=t('Edit Properties')?></option>
 					<option value="activate"><?=t('Activate')?></option>
 					<option value="deactivate"><?=t('Deactivate')?></option>
-					<option value="group_add"><?=t('Add to Group')?></option>
-					<option value="group_remove"><?=t('Remove from Group')?></option>
-					<option value="password_reset"><?=t('Reset Password')?></option>
 					<option value="delete"><?=t('Delete')?></option>
 				<? if ($mode == 'choose_multiple') { ?>
 					<option value="choose"><?=t('Choose')?></option>
@@ -133,6 +130,6 @@
 
 <script type="text/javascript">
 $(function() { 
-	ccm_setupUserSearch('<?=$searchInstance?>'); 
+	ccm_setupUserSearch(); 
 });
 </script>

web/concrete/js/ccm_app/ui.js

@@ -427,7 +427,7 @@ ccm_triggerSelectUser = function(uID, uName, uEmail) {
 	alert(uEmail);
 }
 
-ccm_setupUserSearch = function(searchInstance) {
+ccm_setupUserSearch = function() {
 	$(".chosen-select").chosen();	
 
 	$("#ccm-user-list-cb-all").click(function() {
@@ -481,7 +481,7 @@ ccm_setupUserSearch = function(searchInstance) {
 					width: 630,
 					height: 450,
 					modal: false,
-					href: CCM_TOOLS_PATH + '/users/bulk_activate?searchInstance='+ searchInstance + '&' + uIDstring,
+					href: CCM_TOOLS_PATH + '/users/bulk_activate?' + uIDstring,
 					title: ccmi18n.user_activate				
 				});
 				break;
@@ -494,7 +494,7 @@ ccm_setupUserSearch = function(searchInstance) {
 					width: 630,
 					height: 450,
 					modal: false,
-					href: CCM_TOOLS_PATH + '/users/bulk_deactivate?searchInstance='+ searchInstance + '&' + uIDstring,
+					href: CCM_TOOLS_PATH + '/users/bulk_deactivate?' + uIDstring,
 					title: ccmi18n.user_deactivate
 				});
 				break;
@@ -507,36 +507,10 @@ ccm_setupUserSearch = function(searchInstance) {
 					width: 630,
 					height: 450,
 					modal: false,
-					href: CCM_TOOLS_PATH + '/users/bulk_password_reset?searchInstance='+ searchInstance + '&' + uIDstring,
+					href: CCM_TOOLS_PATH + '/users/bulk_password_reset?' + uIDstring,
 					title: ccmi18n.user_password_reset				
 				});
 				break;
-			case "group_add": 
-				uIDstring = '';
-				$("td.ccm-user-list-cb input[type=checkbox]:checked").each(function() {
-					uIDstring=uIDstring+'&uID[]='+$(this).val();
-				});
-				jQuery.fn.dialog.open({
-					width: 630,
-					height: 450,
-					modal: false,
-					href: CCM_TOOLS_PATH + '/users/bulk_group_add?searchInstance='+ searchInstance + '&' + uIDstring,
-					title: ccmi18n.user_group_add		
-				});
-				break;
-			case "group_remove": 
-				uIDstring = '';
-				$("td.ccm-user-list-cb input[type=checkbox]:checked").each(function() {
-					uIDstring=uIDstring+'&uID[]='+$(this).val();
-				});
-				jQuery.fn.dialog.open({
-					width: 630,
-					height: 450,
-					modal: false,
-					href: CCM_TOOLS_PATH + '/users/bulk_group_remove?searchInstance='+ searchInstance + '&' + uIDstring,
-					title: ccmi18n.user_group_remove				
-				});
-				break;
 			case "delete": 
 				uIDstring = '';
 				$("td.ccm-user-list-cb input[type=checkbox]:checked").each(function() {
@@ -546,7 +520,7 @@ ccm_setupUserSearch = function(searchInstance) {
 					width: 630,
 					height: 450,
 					modal: false,
-					href: CCM_TOOLS_PATH + '/users/bulk_delete?searchInstance='+ searchInstance + '&' + uIDstring,
+					href: CCM_TOOLS_PATH + '/users/bulk_delete?' + uIDstring,
 					title: ccmi18n.user_delete				
 				});
 				break;

web/concrete/models/userinfo.php

@@ -321,10 +321,6 @@ public function sendPrivateMessage($recipient, $subject, $text, $inReplyTo = fal
 			}
 		}
 
-		/**
-		 * gets the user object of the current UserInfo object ($this)
-		 * @return User
-		 */
 		public function getUserObject() {
 			// returns a full user object - groups and everything - for this userinfo object
 			$nu = User::getByUserID($this->uID);
@@ -333,7 +329,7 @@ public function getUserObject() {
 
 		/** 
 		 * Sets the attribute of a user info object to the specified value, and saves it in the database 
-		*/
+		 */
 		public function setAttribute($ak, $value) {
 			Loader::model('attribute/categories/user');
 			if (!is_object($ak)) {

web/concrete/tools/i18n_js.php

@@ -65,17 +65,14 @@
 	properties: "<?=t('Properties')?>",
 	savePropertiesMsg: "<?=t('Page Properties saved.')?>",
 	saveSpeedSettingsMsg: "<?=t("Speed Settings saved.")?>",
-	saveUserSettingsMsg: "<?=t("User Settings saved.")?>",
 	ok: "<?=t('Ok')?>",
 	newsflowLoading: "<?=t("Checking for updates.")?>",
 	authoredBy: "<?=t('by')?>",
 	x: "<?=t('x')?>",
 	user_activate: "<?=t('Activate Users')?>",
 	user_deactivate: "<?=t('Deactivate Users')?>",
 	user_password_reset: "<?=t('Reset Passwords')?>",
-	user_delete: "<?=t('Delete')?>",
-	user_group_remove: "<?=t('Remove From Group')?>",
-	user_group_add: "<?=t('Add to Group')?>"
+	user_delete: "<?=t('Delete')?>"
 }
 
 var ccmi18n_sitemap = {

web/concrete/tools/users/bulk_activate.php

@@ -1,9 +1,4 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
-$searchInstance = $_REQUEST['searchInstance'];
-if(!strlen($searchInstance)) {
-	$searchInstance = 'user';
-}
-
 $form = Loader::helper('form');
 $ih = Loader::helper('concrete/interface');
 $tp = new TaskPermission();
@@ -41,16 +36,9 @@
 				echo $form->hidden('uID[]' , $ui->getUserID());
 			}
 			?>
-			<div class="clearfix">
-				<div class="input">
-					<label><?php echo t('Select Group')?></label>
-
-				</div>
-			</div>
-
 			<?php echo t('Are you sure you would like to activate the following users?');?><br/><br/>
 			<?php Loader::element('users/confirm_list',array('users'=>$users)); ?>
-		</form>	
+		</form>
 	</div>
 	<div class="dialog-buttons">
 		<?=$ih->button_js(t('Cancel'), 'jQuery.fn.dialog.closeTop()', 'left', 'btn')?>	
@@ -64,13 +52,8 @@
 <script type="text/javascript">
 ccm_userBulkActivate = function() { 
 	$("#ccm-user-bulk-activate").ajaxSubmit(function(resp) {
-		jQuery.fn.dialog.closeTop();
-		jQuery.fn.dialog.hideLoader();
-		ccm_deactivateSearchResults('<?=$searchInstance?>');
-		ccmAlert.hud(ccmi18n.saveUserSettingsMsg, 2000, 'success', ccmi18n.user_activate);
-		$("#ccm-<?=$searchInstance?>-advanced-search").ajaxSubmit(function(r) {
-		       ccm_parseAdvancedSearchResponse(r, '<?=$searchInstance?>');
-		});
 	});
+	jQuery.fn.dialog.closeTop();
+	ccm_setupUserSearch();
 };
 </script>

web/concrete/tools/users/bulk_deactivate.php

@@ -1,10 +1,4 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
-
-$searchInstance = $_REQUEST['searchInstance'];
-if(!strlen($searchInstance)) {
-	$searchInstance = 'user';
-}
-
 $form = Loader::helper('form');
 $ih = Loader::helper('concrete/interface');
 $tp = new TaskPermission();
@@ -58,14 +52,8 @@
 <script type="text/javascript">
 ccm_userBulkDeactivate = function() { 
 	$("#ccm-user-bulk-deactivate").ajaxSubmit(function(resp) {
-		jQuery.fn.dialog.closeTop();
-		jQuery.fn.dialog.hideLoader();
-		ccm_deactivateSearchResults('<?=$searchInstance?>');
-		ccmAlert.hud(ccmi18n.saveUserSettingsMsg, 2000, 'success', ccmi18n.user_deactivate);
-		$("#ccm-<?=$searchInstance?>-advanced-search").ajaxSubmit(function(r) {
-		       ccm_parseAdvancedSearchResponse(r, '<?=$searchInstance?>');
-		});
 	});
-
+	jQuery.fn.dialog.closeTop();
+	ccm_setupUserSearch();
 };
 </script>

web/concrete/tools/users/bulk_delete.php

@@ -1,10 +1,4 @@
 <?php defined('C5_EXECUTE') or die("Access Denied.");
-
-$searchInstance = $_REQUEST['searchInstance'];
-if(!strlen($searchInstance)) {
-	$searchInstance = 'user';
-}
-
 $form = Loader::helper('form');
 $ih = Loader::helper('concrete/interface');
 $tp = new TaskPermission();
@@ -74,14 +68,8 @@
 <script type="text/javascript">
 ccm_userBulkActivate = function() { 
 	$("#ccm-user-bulk-delete").ajaxSubmit(function(resp) {
-		jQuery.fn.dialog.closeTop();
-		jQuery.fn.dialog.hideLoader();
-		ccm_deactivateSearchResults('<?=$searchInstance?>');
-		ccmAlert.hud(ccmi18n.saveUserSettingsMsg, 2000, 'success', ccmi18n.user_delete);
-		$("#ccm-<?=$searchInstance?>-advanced-search").ajaxSubmit(function(r) {
-		       ccm_parseAdvancedSearchResponse(r, '<?=$searchInstance?>');
-		});
 	});
-
+	jQuery.fn.dialog.closeTop();
+	ccm_setupUserSearch();
 };
 </script>