gleimar 2014-04-23 13:24:15 +00:00
parent e9d573f908
commit 878ca95d21
3 changed files with 8 additions and 8 deletions

View File

@ -275,6 +275,11 @@ public class EditarPricingController extends MyGenericForwardComposer {
gravarNovo = (Boolean) Executions.getCurrent().getArg().get("gravarNovo"); gravarNovo = (Boolean) Executions.getCurrent().getArg().get("gravarNovo");
super.doAfterCompose(comp); super.doAfterCompose(comp);
pricingCategoriaList.setDisabled(Boolean.TRUE);
btnNovoCategoria.setDisabled(Boolean.TRUE);
btnApagarCategoria.setDisabled(Boolean.TRUE);
btnModificarCategoria.setDisabled(Boolean.TRUE);
popularCombobox(cmbIndGeneraFeriadoFechaVenta); popularCombobox(cmbIndGeneraFeriadoFechaVenta);
popularCombobox(cmbIndGeneraFeriadoFechaViaje); popularCombobox(cmbIndGeneraFeriadoFechaViaje);
@ -647,7 +652,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
Categoria categoria = null; Categoria categoria = null;
if (ApplicationProperties.getInstance().habilitarPricingCategoria()) { if (ApplicationProperties.getInstance().habilitarPricingCategoria()) {
categoriaService.obtenerTodos();
pricingCategoriaList.setDisabled(Boolean.FALSE); pricingCategoriaList.setDisabled(Boolean.FALSE);
btnNovoCategoria.setDisabled(Boolean.FALSE); btnNovoCategoria.setDisabled(Boolean.FALSE);
btnApagarCategoria.setDisabled(Boolean.FALSE); btnApagarCategoria.setDisabled(Boolean.FALSE);
@ -655,10 +659,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
}else{ }else{
categoria = categoriaService.obtenerID(1); categoria = categoriaService.obtenerID(1);
pricingCategoriaList.setDisabled(Boolean.TRUE);
btnNovoCategoria.setDisabled(Boolean.TRUE);
btnApagarCategoria.setDisabled(Boolean.TRUE);
btnModificarCategoria.setDisabled(Boolean.TRUE);
} }

View File

@ -304,7 +304,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error(e); log.error("",e);
log.debug("Porcentagem Zero"); log.debug("Porcentagem Zero");
} }
@ -485,7 +485,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error("",ex);
} }
} }

View File

@ -1 +1 @@
ADM_20140423_1RC346 ADM_20140423_1RC347