|
@@ -657,20 +657,17 @@ public class ProceduresController {
|
|
|
model.put("procedure", p);
|
|
model.put("procedure", p);
|
|
|
List<Rol> roles = rs.findAssignables();
|
|
List<Rol> roles = rs.findAssignables();
|
|
|
model.put("roles", roles.stream().map(RolDTO::new).toList());
|
|
model.put("roles", roles.stream().map(RolDTO::new).toList());
|
|
|
- model.put("redirect", "components/form_procedure");
|
|
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
else if(!idProces.equals("0") && action.equals("remove")) {
|
|
else if(!idProces.equals("0") && action.equals("remove")) {
|
|
|
p = ps.findByID(Integer.parseInt(idProces));
|
|
p = ps.findByID(Integer.parseInt(idProces));
|
|
|
model.put("procedure", p);
|
|
model.put("procedure", p);
|
|
|
- model.put("redirect", "components/form_procedure_remove_confirm");
|
|
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
model.put("procedure", p);
|
|
model.put("procedure", p);
|
|
|
List<Rol> roles = rs.findAssignables();
|
|
List<Rol> roles = rs.findAssignables();
|
|
|
model.put("roles", roles);
|
|
model.put("roles", roles);
|
|
|
- model.put("redirect", "components/form_procedure");
|
|
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -685,14 +682,14 @@ public class ProceduresController {
|
|
|
Plantilla p = new Plantilla();
|
|
Plantilla p = new Plantilla();
|
|
|
model.put("editable", true);
|
|
model.put("editable", true);
|
|
|
model.put("template", p);
|
|
model.put("template", p);
|
|
|
- model.put("redirect", "components/form_template");
|
|
|
|
|
|
|
+ model.put("redirect", true);
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
else if(action.equals("edit")) {
|
|
else if(action.equals("edit")) {
|
|
|
Plantilla p = plc.findByID(idPlantilla);
|
|
Plantilla p = plc.findByID(idPlantilla);
|
|
|
model.put("editable", false);
|
|
model.put("editable", false);
|
|
|
model.put("template", p);
|
|
model.put("template", p);
|
|
|
- model.put("redirect", "components/form_template");
|
|
|
|
|
|
|
+ model.put("redirect", true);
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
else if(action.equals("duplicate")) {
|
|
else if(action.equals("duplicate")) {
|
|
@@ -700,10 +697,10 @@ public class ProceduresController {
|
|
|
p.setVersio(p.getVersio()+1);
|
|
p.setVersio(p.getVersio()+1);
|
|
|
model.put("editable", true);
|
|
model.put("editable", true);
|
|
|
model.put("template", p);
|
|
model.put("template", p);
|
|
|
- model.put("redirect", "components/form_template");
|
|
|
|
|
|
|
+ model.put("redirect", true);
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
- model.put("redirect", "");
|
|
|
|
|
|
|
+ model.put("redirect", false);
|
|
|
return model;
|
|
return model;
|
|
|
}
|
|
}
|
|
|
|
|
|