Removed use of location and redirect

src/main/java/es/uv/saic/web/OrganController.java

@@ -219,7 +219,6 @@ public class OrganController {
 		o.setValue(0);
 		supervisable_cents.add(o);
 		model.put("sup_orgs", supervisable_cents);
-        model.put("redirect", "components/selector_titulacions");
 		return model;
 	}
 
@@ -232,7 +231,6 @@ public class OrganController {
 		List<Organ> sup_titulacions;
 		sup_titulacions = this.os.getTitulacionsByCentre(centre);
 		model.put("resp_titulacions", sup_titulacions);
-		model.put("redirect", "components/selector_titulacions_managers");
 
 		return model;
 	}
@@ -304,7 +302,6 @@ public class OrganController {
 		}
 		
 		model.put("sup_orgs", titulations);
-        model.put("redirect", "components/selector_titulacions");
 		return model;
 	}
 	
@@ -368,7 +365,6 @@ public class OrganController {
 			}
 		}
 		model.put("sup_orgs", titulations);
-		model.put("redirect", "components/selector_titulacions");
         return model;
 	}
 
@@ -402,7 +398,6 @@ public class OrganController {
 			titulations.add(c);
 		}
 		model.put("sup_orgs", titulations);
-		model.put("redirect", "components/selector_titulacions");
         return model;
 	}
 
@@ -429,7 +424,6 @@ public class OrganController {
 			centres.add(c);
 		}
 		model.put("sup_centers", centres);
-		model.put("redirect", "components/selector_centres");
         return model;
 	}
 }

src/main/java/es/uv/saic/web/ProceduresController.java

@@ -121,7 +121,6 @@ public class ProceduresController {
 		if(_new != null) {
 			model.put("new_access", true);
 		}
-		model.put("location", "procedures");
 		
 		Usuari u = us.findByUsername(usuari);
 		List<InstanciaTransfer> plist = new ArrayList<InstanciaTransfer>();
@@ -168,7 +167,6 @@ public class ProceduresController {
 			plist.add(it);
 		}
 		model.put("procedure_list", plist);
-		model.put("redirect", "procedures");
 		return model;
 	}
 	
@@ -187,7 +185,6 @@ public class ProceduresController {
 		Usuari u = us.findByUsername(usuari);
 
 		this.loadProcedure(model, u, id);
-		model.put("redirect", "procedure");
 		return model;
 	}
 	
@@ -208,12 +205,11 @@ public class ProceduresController {
 	 */
 	@PostMapping("/procedure/files/{id}")
 	@ResponseBody 
-	public HashMap<String, Object> updateInstanciaTascaEvidencia(@RequestParam String location, @PathVariable BigInteger id, @RequestParam Map<String,String> params, 
+	public HashMap<String, Object> updateInstanciaTascaEvidencia(@PathVariable BigInteger id, @RequestParam Map<String,String> params, 
 			@RequestParam(required = true) List<MultipartFile> evidencias, @RequestParam String usuari) throws IllegalStateException, IOException {
 		HashMap<String, Object> model = new HashMap<>();
 		Usuari u = us.findByUsername(usuari);
-
-		model.put("location", "procedures");
+		
 		InstanciaTasca it = its.findById(new BigInteger(params.get("taskid")));
 		
 		/* Tipos de tarea permitidas */
@@ -283,12 +279,10 @@ public class ProceduresController {
 	 * @return The name of the view to render
 	 */
 	@PostMapping("/procedure/{id}")
-	public HashMap<String, Object> updateInstanciaTasca(@RequestParam String location, @PathVariable BigInteger id, @RequestParam Map<String,String> params, 
+	public HashMap<String, Object> updateInstanciaTasca(@PathVariable BigInteger id, @RequestParam Map<String,String> params, 
 			@RequestParam(required = false) List<MultipartFile> evidencias, @RequestParam String usuari) throws IllegalStateException, IOException, InterruptedException {
 		HashMap<String, Object> model = new HashMap<>();
 		Usuari u = us.findByUsername(usuari);
-
-		model.put("location", "procedures");
 	
 		// Update task instance 
 		InstanciaTasca it = its.findById(new BigInteger(params.get("taskid")));
@@ -312,7 +306,6 @@ public class ProceduresController {
 
 		this.saveChanges(u, it);
 		this.loadProcedure(model, u, id);
-		model.put("redirect", "procedure");
 		return model; 
 	}
 	
@@ -342,13 +335,11 @@ public class ProceduresController {
 	 */
 	@PostMapping("/procedure/save/{id}")
 	@ResponseBody
-	public HashMap<String, Object> saveDraft(@RequestParam String location, @PathVariable BigInteger id, @RequestParam String text, 
+	public HashMap<String, Object> saveDraft(@PathVariable BigInteger id, @RequestParam String text, 
 							@RequestParam boolean manual, @RequestParam String usuari) {
 		HashMap<String, Object> model = new HashMap<>();
 		Usuari u = us.findByUsername(usuari);
 
-		model.put("location", !location.equals(null) ? location : "procedures");
-
 		InstanciaTasca it = its.findById(id);
 		it.setText(text);
 		it.setUsuari(u);
@@ -505,7 +496,6 @@ public class ProceduresController {
 		List<InstanciaTascaVer> itvs = this.itsver.findByIdInstanciaTasca(id);
 		model.put("versions", itvs);
 		model.put("idInstanciaTasca", id);
-		model.put("redirect", "procedure_versions");
 		return model;
 	}
 
@@ -605,7 +595,6 @@ public class ProceduresController {
 				supervisable_years.add(d);
 			}
 			model.put("sup_years", supervisable_years);
-            model.put("redirect", "components/selector_cursos");
 		return model;
 	}
 
@@ -634,7 +623,6 @@ public class ProceduresController {
 		supervisable_procedures.removeIf(p -> !set.add(p.getText()));
 		Collections.sort(supervisable_procedures, comparing(DummyDataTransfer::getText));
 		model.put("sup_procs", supervisable_procedures);
-		model.put("redirect", "components/selector_processos");
 
 		return model;
 	}

src/main/java/es/uv/saic/web/StatsController.java

@@ -108,7 +108,6 @@ public class StatsController {
 			pendingEmails.add(p);
 		}
 		model.put("pendingEmails", pendingEmails);
-		model.put("redirect", "adminStats");
 		return model;
 	}
 }

src/main/java/es/uv/saic/web/SupervisionController.java

@@ -194,7 +194,6 @@ public class SupervisionController {
 			model.put("restore", null);
 		}
 		
-		model.put("redirect", "supervision");
 		return model;
 	}
 	
@@ -228,11 +227,9 @@ public class SupervisionController {
 
 		Usuari u = us.findByUsername(usuari);
 
-		model.put("location", "supervision");
 		if(centres == null) { centres = us.getSupervisableCentres(u); }
 		this.loadResults(model, u, centres, titulacions, cursos, procediments, evidencies, searchType);
 		model.put("searchParams", new SupervisionSearchParams(centres, titulacions, cursos, procediments, evidencies, searchType));
-		model.put("redirect", "supervisionProcedures");
 		return model;
 	}
 	
@@ -249,11 +246,9 @@ public class SupervisionController {
 		HashMap<String, Object> model = new HashMap<>();
 		Usuari u = us.findByUsername(usuari);
 
-		model.put("location", "supervision");
 		if(ssp != null) {
 			this.loadResults(model, u, ssp.getCentres(), ssp.getTitulacions(), ssp.getCursos(), ssp.getProcediments(), ssp.getEvidencies(), ssp.getSearchType());
 		}
-		model.put("redirect", "supervisionProcedures");
 
 		return model; 
 	}

src/main/java/es/uv/saic/web/TascaController.java

@@ -122,8 +122,8 @@ public class TascaController {
 			c.setText3(e.getNomEvidenciaVal());
 			supervisable_evs.add(c);
 		}
+        
 		model.put("sup_evs", supervisable_evs);
-        model.put("redirect", "components/selector_evidencies");
 		return model;
 	}