[evolvis-commits] r17131: pending merges: ↵ papel 2011-03-1 =?UTF-8?Q?0=20?=[#944]=?UTF-8?Q?=20Bug=C3=BCbersicht?=: Auch nach submitter =?UTF-8?Q?filtern=20lassen=E2=86=B5=20=E2=86=B5?==?UTF-8?Q?=20ugh?=, this uses even more ECMAscript… why?=?=?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Mar 16 12:43:30 CET 2011


Author: mirabilos
Date: 2011-03-16 12:43:30 +0100 (Wed, 16 Mar 2011)
New Revision: 17131

Modified:
   trunk/gforge_base/evolvisforge/
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/include/html.php
   trunk/gforge_base/evolvisforge/gforge/www/js/common.js
   trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
Log:
pending merges:
  papel 2011-03-10 [#944] Bugübersicht: Auch nach submitter filtern lassen

ugh, this uses even more ECMAscript… why?



Property changes on: trunk/gforge_base/evolvisforge
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/gforge_base/evolvisforge:6445,6799,6975,6984,7063,7172,7174-7175,7192,7195-7196,7217-7218,7222-7224,8213-8214,14862-14864,17109-17111,17117-17118,17119-17121

   + /trunk/gforge_base/evolvisforge:6445,6799,6975,6984,7063,7172,7174-7175,7192,7195-7196,7217-7218,7222-7224,8213-8214,14862-14864,17109-17111,17117-17118,17119-17121,17129

Modified: svk:merge
   - 8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17111
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17117
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17121
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6445
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6799
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6975
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6984
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7063
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7175
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7192
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7196
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7218

   + 8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17111
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17117
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17121
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:17129
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6445
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6799
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6975
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:6984
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7063
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7175
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7192
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7196
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge:7218


Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-03-16 11:43:27 UTC (rev 17130)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-03-16 11:43:30 UTC (rev 17131)
@@ -15,7 +15,7 @@
   * XHTML fixes
   * [#1320] unbreak “focus” on tracker items
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 16 Mar 2011 12:37:32 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 16 Mar 2011 12:42:37 +0100
 
 gforge (4.8.3+evolvis29) unstable; urgency=high
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/include/html.php	2011-03-16 11:43:27 UTC (rev 17130)
+++ trunk/gforge_base/evolvisforge/gforge/www/include/html.php	2011-03-16 11:43:30 UTC (rev 17131)
@@ -302,20 +302,46 @@
  * @param		bool	Whether or not to show the 'Any row'
  * @param		string	What to call the 'Any row' defaults to any
  */
-function html_build_select_box_from_arrays ($vals,$texts,$select_name,$checked_val='xzxz',$show_100=true,$text_100='none',$show_any=false,$text_any='any') {
+function html_build_select_box_from_arrays ($vals,$texts,$select_name,$checked_val='xzxz',$show_100=true,$text_100='none',$show_any=false,$text_any='any', $onChangeValue='', $onChangeParams=array()) {
 	if ($text_100=='none'){
 		$text_100=_('None');
 	}
 	$return = '';
-
+	$strParams = '';
 	$rows=count($vals);
 	if (count($texts) != $rows) {
 		$return .= 'ERROR - uneven row counts';
 	}
 
 	$return .= '
-		<select name="'.$select_name.'">';
+		<select name="'.$select_name.'"';
+		
+	if($onChangeValue) {
+		
+		$strParams = "'".$onChangeValue."'" .','.'this.value';
+		
+		if(count($onChangeParams) > 0) {
+				
+			$i = 0;
+			$keys = array_keys($onChangeParams);
+			$strParams .= ",'";
+			foreach($onChangeParams as $param) {
+				if($i != 0) {
+					$strParams .= ';';
+				}
+				$strParams .= $keys[$i].':'.$param;
+				$i++;
+			} 
+			$strParams .= "'";
+		} else {
+			$strParams .= ','."'".'null'."'";
+		}
+		
+		$return .= ' onchange="submitFormOnSelectBoxChanged('.$strParams.')"';	
+	}
 
+	$return .= '>';
+
 	//we don't always want the default Any row shown
 	if ($show_any) {
 		$return .= '

Modified: trunk/gforge_base/evolvisforge/gforge/www/js/common.js
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/js/common.js	2011-03-16 11:43:27 UTC (rev 17130)
+++ trunk/gforge_base/evolvisforge/gforge/www/js/common.js	2011-03-16 11:43:30 UTC (rev 17131)
@@ -121,5 +121,91 @@
 			objStatusBox.options[i].selected = true;
 		}
 	}
-} 
+}
 
+/** 
+ * 
+ * */
+
+function getFirstAtId() {
+	
+	var url = document.URL;
+	
+	var arrParams0 = url.split('atid');
+	
+	var arrParams1 = arrParams0[1].split('&');
+	
+	var arrParams2 = arrParams1[0].split('=');
+	
+	return arrParams2[1]
+}
+
+/**
+ *  function buildUrlParams(params) - Part of function buildUrlParams(params)
+ *
+ *	@param string comma separated string, that indicates parameters and values that has to be submitted in the url
+ *	@return string parameters and values in form of an url
+ **/
+
+function buildUrlParams(params) {
+	
+	var strParams = '';
+	var arrParams = params.split(':');
+
+	for(var i = 0; i < arrParams.length; i++) {
+		if(i % 2 != 0) {
+			strParams += '=';
+		} else {
+			strParams += '&';
+		}
+		strParams += arrParams[i];
+	}	
+	
+	return strParams;
+}
+
+/**
+ *	function buildUrlParams(params) - Submits some parameters onChange to the url within the url
+ *
+ *	@param	int	nameOfValue
+ *	@param	int	value
+ *	@param 	string comma and semicolon separated string, that indicates parameters and values that has to be submitted in the url
+ **/
+
+function submitFormOnSelectBoxChanged(nameOfValue, value, params) {
+	
+	/* BEGIN Need this fix for this special implementation */
+	if(value == 0) {	
+		value = getFirstAtId();
+		params += ';search_all:1';
+	}
+	/* END */
+	
+	var url = document.URL;
+	var strParams = '';
+	
+	if(url.indexOf('?')!=-1) {
+		var urlWithoutParams = url.split('?');
+		url = urlWithoutParams[0];
+	} 
+	
+	url += '?' + nameOfValue + '=' + value;
+	
+	if(params.indexOf(';')) {
+		var arrSemiParams = params.split(';');
+		
+		for(var i = 0; i < arrSemiParams.length; i++) {
+			
+			if(arrSemiParams[i].indexOf(':')!=-1) {
+				strParams += buildUrlParams(arrSemiParams[i]);
+			} 
+		}
+		
+		url += strParams;
+	} else {
+		strParams += buildUrlParams(params);
+		url += strParams;
+	}
+	
+	top.location.href = url;
+}

Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php	2011-03-16 11:43:27 UTC (rev 17130)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php	2011-03-16 11:43:30 UTC (rev 17131)
@@ -220,8 +220,12 @@
 	$selected_tracker = $atid;
 }
 
-$arrSubTrackerBox = html_build_select_box_from_arrays($arrSubTrackerIds, $arrSubTrackerNames, 'selected_tracker', $selected_tracker, false, _('Unassigned'),true, _('Any'));
+$onChangeValue = 'atid';
+$extOnChangeParams  = array();
+$extOnChangeParams = array('group_id' => $group_id);
 
+$arrSubTrackerBox = html_build_select_box_from_arrays($arrSubTrackerIds, $arrSubTrackerNames, 'selected_tracker', $selected_tracker, false, _('Unassigned'),true, _('Any'), $onChangeValue, $extOnChangeParams);
+
 $tech_box = html_build_select_box_from_arrays ($tech_id_arr,$tech_name_arr,'_assigned_to',$_assigned_to,true,_('Unassigned'),true,_('Any'));
 
 $arrSubmitterBox = html_build_select_box_from_arrays($creators_id_arr, $creators_name_arr, '_submitted_by', $_submitted_by, true, _('Unassigned'), true, _('Any'));



More information about the evolvis-commits mailing list