BugID: 1050 - Modifiche Articolo 18

consiglionazionaledellericerche · Jan 3, 2013 · 81b3450 · 81b3450
1 parent 80da5cf
commit 81b3450
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/config00/bp/CRUDConfigAnagContrattoMasterBP.java b/sigla-ejb/src/main/java/it/cnr/contab/config00/bp/CRUDConfigAnagContrattoMasterBP.java
@@ -8,6 +8,7 @@
 import it.cnr.jada.bulk.OggettoBulk;
 import it.cnr.jada.util.jsp.Button;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -25,7 +26,7 @@ public CRUDConfigAnagContrattoMasterBP(String s) {
 	@Override
 	public boolean isPublishCRUDButtonHidden() {
 		if (isSearching() || isInserting())
-			return false;
+			return true;
 		if (getModel()!=null){
 			ContrattoBulk contratto = (ContrattoBulk) getModel();
 			if (contratto.isProvvisorio())
@@ -41,6 +42,8 @@ public boolean isPublishCRUDButtonHidden() {
 	}
 
 	public boolean isUpublishCRUDButtonHidden() {
+		if (isSearching() || isInserting())
+			return true;
 		return !isPublishCRUDButtonHidden();
 	}
 
@@ -57,10 +60,12 @@ public boolean isAllegatiEnabled() {
 	@Override
 	protected Button[] createToolbar() {
 		Button[] baseToolbar = super.createToolbar();
-		List<Button> newToolbar = Arrays.asList(baseToolbar);
+		List<Button> newToolbar = new ArrayList<Button>();
+		newToolbar.addAll(Arrays.asList(baseToolbar));
 		Button unPublish = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config.getHandler().getProperties(getClass()),"CRUDToolbar.publish");
 		unPublish.setLabel("<u>A</u>nnulla<br>Pubblicazione");
 		unPublish.setTitle("Annulla Pubblicazione");
+		unPublish.setStyle("width:100px");
 		unPublish.setHiddenProperty("upublishCRUDButtonHidden");
 		unPublish.setHref("javascript:submitForm('doUnpublishContratto')");
 		newToolbar.add(unPublish);

diff --git a/sigla-ejb/src/main/resources/META-INF/persistence.xml b/sigla-ejb/src/main/resources/META-INF/persistence.xml
@@ -23,4 +23,4 @@
 			<property name="hibernate.show_sql" value="true"/>		  
 		</properties>
 	</persistence-unit>
-</persistence>
+</persistence>