[GovWayConsole]

Risolto bug sull'utilizzo dei filtro dopo aver creato o modificato un oggetto: i filtri con postback ridirigevano erroneamente sulle pagine di 'Add', 'Change' e 'Delete' invece che sulla pagina 'list'.
link-it · Jun 3, 2021 · 413ed9c · 413ed9c
1 parent 59101d1
commit 413ed9c
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,12 @@
 
 	* Rilasciata versione 3.3.4
 
+2021-06-04  Giuliano Pintori <[email protected]>
+
+	* [GovWayConsole]
+	Risolto bug sull'utilizzo dei filtro dopo aver creato o modificato un oggetto.
+	I filtri con postback ridirigevano erroneamente sulle pagine di 'Add', 'Change' e 'Delete' invece che sulla pagina 'list'.
+
 2021-06-04  Andrea Poli <[email protected]>
 
 	* [GovWayCore]

diff --git a/ant/setup/ant/patch-build.xml b/ant/setup/ant/patch-build.xml
@@ -331,7 +331,7 @@ Esempi:
 						<equals arg1="${patchArchiveType}" arg2="runtimeRepository"/>
 					</or>
 					<then>
-						<var name="patchTmpArchive" value="${tmp_batch}/runtimeRepository"/>
+						<var name="patchTmpArchive" value="${tmp_batch}/gestoreRuntimeRepository"/>
 						<var name="patchTmpArchiveType" value="ear"/>
 						<foreach target="-patch-resource" param="patchResource" inheritall="true">
 							<path>

diff --git a/tools/web_interfaces/lib/jsplib/full-list-noTable.jsp b/tools/web_interfaces/lib/jsplib/full-list-noTable.jsp
@@ -134,7 +134,7 @@ String classPanelTitolo = mostraFormHeader ? "panelListaRicerca" : "panelListaRi
 							  	String [] values = filtro.getValues();
 							  	String [] labels = filtro.getLabels();
 							  	String selezionato = filtro.getSelected();
-								String selEvtOnChange = !filtro.getOnChange().equals("") ? (" onChange=\""+ Costanti.JS_FUNCTION_VISUALIZZA_AJAX_STATUS +"Change(document.form,'"+filterName+"')\" " ) : " ";
+								String selEvtOnChange = !filtro.getOnChange().equals("") ? (" onChange=\""+ Costanti.JS_FUNCTION_VISUALIZZA_AJAX_STATUS +"Change(document.form,'"+filterName+"',true)\" " ) : " ";
 								String classInput = filtro.getStyleClass();
 								String filterId = filterName + "__id";
 							  	%>

diff --git a/tools/web_interfaces/lib/jsplib/full-list.jsp b/tools/web_interfaces/lib/jsplib/full-list.jsp
@@ -133,7 +133,7 @@ String classPanelTitolo = mostraFormHeader ? "panelListaRicerca" : "panelListaRi
 							  	String [] values = filtro.getValues();
 							  	String [] labels = filtro.getLabels();
 							  	String selezionato = filtro.getSelected();
-								String selEvtOnChange = !filtro.getOnChange().equals("") ? (" onChange=\""+ Costanti.JS_FUNCTION_VISUALIZZA_AJAX_STATUS +"Change(document.form,'"+filterName+"')\" " ) : " ";
+								String selEvtOnChange = !filtro.getOnChange().equals("") ? (" onChange=\""+ Costanti.JS_FUNCTION_VISUALIZZA_AJAX_STATUS +"Change(document.form,'"+filterName+"',true)\" " ) : " ";
 								String classInput = filtro.getStyleClass();
 								String filterId = filterName + "__id";
 							  	%>

diff --git a/tools/web_interfaces/lib/jsplib/listElement.jsp b/tools/web_interfaces/lib/jsplib/listElement.jsp
@@ -387,7 +387,22 @@ function Esporta(tipo) {
 };
 
 function Change(form,dataElementName) {
+	Change(form,dataElementName,false);
+}
+function Change(form,dataElementName,fromFilters) {
     
+	if( fromFilters ){
+		if(form.action.endsWith('Add.do')){
+			form.action=form.action.replace('Add.do','List.do');
+		}
+		if(form.action.endsWith('Change.do')){
+			form.action=form.action.replace('Change.do','List.do');
+		}
+		if(form.action.endsWith('Del.do')){
+			form.action=form.action.replace('Del.do','List.do');
+		}
+	}
+	
     //aggiungo parametro per indicare che si tratta di postback e azzero idhid
     addHidden(form, 'isPostBack' , true);
     if(dataElementName!=null)

diff --git a/...ica/server/src/org/openspcoop2/core/diagnostica/ws/server/MessaggioDiagnosticoSearch.java b/...ica/server/src/org/openspcoop2/core/diagnostica/ws/server/MessaggioDiagnosticoSearch.java
@@ -19,22 +19,18 @@
  */
 package org.openspcoop2.core.diagnostica.ws.server;
 
-import org.openspcoop2.core.diagnostica.ws.server.filter.SearchFilterMessaggioDiagnostico;
 import java.util.List;
 
-
-import org.openspcoop2.core.diagnostica.MessaggioDiagnostico;
-
-import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaServiceException_Exception;
-import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaNotFoundException_Exception;
-import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaMultipleResultException_Exception;
-import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaNotImplementedException_Exception;
-import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaNotAuthorizedException_Exception;
-
 import javax.jws.soap.SOAPBinding.ParameterStyle;
 import javax.jws.soap.SOAPBinding.Style;
 import javax.jws.soap.SOAPBinding.Use;
 
+import org.openspcoop2.core.diagnostica.MessaggioDiagnostico;
+import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaNotAuthorizedException_Exception;
+import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaNotImplementedException_Exception;
+import org.openspcoop2.core.diagnostica.ws.server.exception.DiagnosticaServiceException_Exception;
+import org.openspcoop2.core.diagnostica.ws.server.filter.SearchFilterMessaggioDiagnostico;
+
 /**     
  * MessaggioDiagnosticoSearch
  *

diff --git a/...erver/src/org/openspcoop2/core/diagnostica/ws/server/filter/beans/DominioDiagnostico.java b/...erver/src/org/openspcoop2/core/diagnostica/ws/server/filter/beans/DominioDiagnostico.java
@@ -38,9 +38,8 @@
  */
 
 import java.io.Serializable;
- 
+
 import javax.xml.bind.annotation.XmlElement;
-import org.openspcoop2.core.diagnostica.ws.server.filter.beans.DominioSoggetto;
 
 /**     
  * DominioDiagnostico