From ffc6843f525ef7dc30b048826b87a8593cd5efaa Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 5 Feb 2016 17:44:52 +0000
Subject: [PATCH] fixes bug #6989

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@52706 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../tarifas/EditarTarifaMinimaController.java       |  9 ++++++++-
 web/gui/tarifas/editarTarifasMinimas.zul            | 13 ++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
index c12a1dd94..3aad7566b 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
@@ -242,7 +242,9 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
         txtImportancia.focus();
         
         tarifaMinimaCategoriaList.setItemRenderer(new RenderTarifaMinimaCategoria());
-        tarifaMinimaCategoriaList.setData(tarifaMinima.getTarifaMinimaCategorias());
+        if(tarifaMinima.getTarifaMinimaCategorias() != null) {
+        	tarifaMinimaCategoriaList.setData(tarifaMinima.getTarifaMinimaCategorias());
+        }
     }
 
     public void onClick$btnSalvar(Event ev) throws InterruptedException {
@@ -446,4 +448,9 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
 	public void setLsCategorias(List<Categoria> lsCategorias) {
 		this.lsCategorias = lsCategorias;
 	}
+	
+	public Boolean isTarifaMinimaSalva() {
+		return getTarifaMinima().getTarifaminimaId() != null;
+	}
+	
 }
diff --git a/web/gui/tarifas/editarTarifasMinimas.zul b/web/gui/tarifas/editarTarifasMinimas.zul
index 0dc11fb3f..54a6e0ba8 100644
--- a/web/gui/tarifas/editarTarifasMinimas.zul
+++ b/web/gui/tarifas/editarTarifasMinimas.zul
@@ -24,7 +24,7 @@
             </hbox>
         </toolbar>
 
-        <grid fixedLayout="true">
+        <grid fixedLayout="true" >
             <columns>
                 <column width="30%" />
                 <column width="70%" />
@@ -95,7 +95,7 @@
                         selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/>
                         
                 </row>
-				<row>
+				<row visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
 					<label id="lblCategorias"
 						value="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" />
 					<combobox id="cmbCategorias"
@@ -110,18 +110,21 @@
 			height="20"
 			 image="/gui/img/add.png"
 			 width="35px"
-	   tooltiptext="${c:l('editarTarifaMinimaController.btnAdicionarCategoria.tooltiptext')}" />
+	   tooltiptext="${c:l('editarTarifaMinimaController.btnAdicionarCategoria.tooltiptext')}"
+	   	   visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}" />
 		<button id="btnRemoverCategoria"
 			height="20"
 			 image="/gui/img/remove.png"
 			 width="35px"
-	   tooltiptext="${c:l('editarTarifaMinimaController.btnRemoverCategoria.tooltiptext')}" />								
+	   tooltiptext="${c:l('editarTarifaMinimaController.btnRemoverCategoria.tooltiptext')}"
+	   	   visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}" />								
 		
 		<listbox id="tarifaMinimaCategoriaList"
 				use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
 			  vflex="true"
 		   multiple="false"
-		   	 height="150px">
+		   	 height="150px"
+		   	visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
 			<listhead sizable="true">
 				<listheader image="/gui/img/create_doc.gif"
 							label="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" />