fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #9654 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72793 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-08-22 14:41:49 +00:00
parent b6f7279327
commit d12f9e5555
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java
View File

@ -85,7 +85,6 @@ import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.vo.esquemaoperacional.RutaTramoVO;
import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoVO;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
View File

@ -283,7 +283,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
pricingListEspAgencia.removeItem(pricingEspecificoAgencia);
pricingEspecificoADesativarAgencia.add(pricingEspecificoAgencia);
} else {
pricingListEspOcupacion.removeSelectedItem();
pricingListEspAgencia.removeSelectedItem();
removerPricingAgencia(pricingEspecificoAgencia);
}
}
@ -306,7 +306,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
pricingListEspCanal.removeItem(pricingEspecificoCanal);
pricingEspecificoADesativarCanal.add(pricingEspecificoCanal);
} else {
pricingListEspOcupacion.removeSelectedItem();
pricingListEspCanal.removeSelectedItem();
removerPricingCanalVendas(pricingEspecificoCanal);
}
}
@ -346,7 +346,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
}
private void removerPricingCanalVendas(PricingEspecificoCanalVendas especificoCanalVendas) {
if (especificoCanalVendas.getPricingEspecificoCanalId() != null) {
pricingEspecifico.getPricingEspecificoAgenciasList().remove(especificoCanalVendas);
pricingEspecifico.getPricingEspecificoCanalVendasList().remove(especificoCanalVendas);
}
}
@ -554,6 +554,8 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
}
desativarPricingEspecificoOcupacionDesativados();
desativarPricingEspecificoAgenciaDesativados();
desativarPricingEspecificoCanalDesativados();
Messagebox.show(Labels.getLabel("editarPricingController.MSG.suscribirOK"),
Labels.getLabel("busquedaPricingEspecificoController.window.title"),

4
web/gui/pricing/editarPricingEspecifico.zul
View File

@ -206,6 +206,7 @@
</rows>
</grid>
</tabpanel>
<!-- AGENCIA -->
<tabpanel>
<grid>
<rows>
@ -244,6 +245,7 @@
</rows>
</grid>
</tabpanel>
<!-- CANAL DE VENDA -->
<tabpanel>
<grid>
<rows>
@ -275,7 +277,7 @@
<listheader
image="/gui/img/create_doc.gif"
sort="auto(ocupacioninicial)"
label="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}" />
label="${c:l('editarPricingController.ptovta.value')}" />
</listhead>
</listbox>
</vbox>