Eliminati bottoni dalla mappa Firma Variazioni

consiglionazionaledellericerche · Dec 14, 2016 · 541e678 · 541e678
1 parent 8a1c619
commit 541e678
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.java b/sigla-ejb/src/main/java/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.java
@@ -145,12 +145,12 @@ public void openForm(javax.servlet.jsp.PageContext context,String action,String
 	}
 
 	public it.cnr.jada.util.jsp.Button[] createToolbar() {
-		Button[] toolbar = new Button[3];
+		Button[] toolbar = new Button[4];
 		int i = 0;
 		toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
 				.getHandler().getProperties(getClass()), "Toolbar.refresh");
-//		toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
-//				.getHandler().getProperties(getClass()), "Toolbar.print");
+		toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
+				.getHandler().getProperties(getClass()), "Toolbar.print");
 //		toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
 //				.getHandler().getProperties(getClass()), "Toolbar.download");
 //		toolbar[i++] = new it.cnr.jada.util.jsp.Button(it.cnr.jada.util.Config
@@ -178,16 +178,11 @@ public void writeToolbar(javax.servlet.jsp.PageContext pageContext)
 			else
 				nomeFileAllegato = nomeFileTest;
 
-//			toolbar[1]
-//					.setHref("doPrint('"
-//							+ JSPUtils
-//									.buildAbsoluteUrl(
-//											pageContext,
-//											null,
-//											"genericdownload/"
-//													+ nomeFileAllegato
-//													+ "?methodName=scaricaFile&it.cnr.jada.action.BusinessProcess="
-//													+ getPath()) + "')");
+			toolbar[1]
+					.setHref("doPrint('genericdownload/"
+													+ nomeFileAllegato
+													+ "?methodName=scaricaFile&it.cnr.jada.action.BusinessProcess="
+													+ getPath() + "')");
 //			toolbar[2]
 //					.setHref("doPrint('"
 //							+ JSPUtils
@@ -216,23 +211,19 @@ public void writeToolbar(javax.servlet.jsp.PageContext pageContext)
 				}
 				if (signedFileName!=null)
 					//toolbar[6]
-					toolbar[2]
-						.setHref("doPrint('"
-								+ JSPUtils
-										.buildAbsoluteUrl(
-												pageContext,
-												null,
-												"genericdownload/"
+					toolbar[3]
+						.setHref("doPrint('genericdownload/"
 														+ signedFileName
 														+ "?methodName=scaricaFileFirmato&it.cnr.jada.action.BusinessProcess="
-														+ getPath()) + "')");
+														+ getPath() + "')");
 			} catch (ApplicationException e) {
 				throw new ServletException(e);
 			}
 		}
 		else {
 //			toolbar[1].setHref(null);
 			toolbar[2].setHref(null);
+			toolbar[3].setHref(null);
 //			toolbar[6].setHref(null);
 		}
 		writeToolbar(pageContext.getOut(), toolbar);

diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.properties b/sigla-ejb/src/main/resources/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.properties
@@ -6,6 +6,15 @@ Toolbar.refresh.style=width:60px;
 Toolbar.refresh.title=Aggiorna
 Toolbar.refresh.accessKey=A
 
+Toolbar.print.img=img/print24.gif
+Toolbar.print.disabledImg=img/print24.gif
+Toolbar.print.label=<u>S</u>tampa
+Toolbar.print.href=javascript:doPrint()
+Toolbar.print.style=width:60px;
+Toolbar.print.enabledProperty=printButtonEnabled
+Toolbar.print.title=Stampa
+Toolbar.print.accessKey=S
+
 Toolbar.printSigned.img=img/print24.gif
 Toolbar.printSigned.disabledImg=img/print24.gif
 Toolbar.printSigned.label=S<u>t</u>ampa <br>Firmato
@@ -15,6 +24,7 @@ Toolbar.printSigned.enabledProperty=printSignedButtonEnabled
 Toolbar.printSigned.title=Stampa Firmato
 Toolbar.printSigned.accessKey=T
 
+
 Toolbar.signOTP.img=img/sign24.gif
 Toolbar.signOTP.disabledImg=img/sign24.gif
 Toolbar.signOTP.label=Firma tramite <u>O</u>TP 
@@ -23,4 +33,3 @@ Toolbar.signOTP.style=width:60px;
 Toolbar.signOTP.enabledProperty=signButtonEnabled
 Toolbar.signOTP.title=Firma tramite OTP
 Toolbar.signOTP.accessKey=O
-