details: https://code.openbravo.com/erp/devel/pi/rev/e38cdd54b4f3
changeset: 22871:e38cdd54b4f3
user: Guillermo Gil <guillermo.gil <at> openbravo.com>
date: Mon Apr 14 16:48:05 2014 +0200
summary: Fixed issue 25870:Popup showing confirmation of export client has
title warning
Added title of advice popups based on msgType
diffstat:
src/org/openbravo/base/secureApp/AdvisePopUp.html | 2 +-
src/org/openbravo/base/secureApp/AdvisePopUp.xml | 1 +
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 3 +++
3 files changed, 5 insertions(+), 1 deletions(-)
diffs (43 lines):
diff -r cae716b1b753 -r e38cdd54b4f3
src/org/openbravo/base/secureApp/AdvisePopUp.html
--- a/src/org/openbravo/base/secureApp/AdvisePopUp.html Mon Apr 14 14:38:22
2014 +0200
+++ b/src/org/openbravo/base/secureApp/AdvisePopUp.html Mon Apr 14 16:48:05
2014 +0200
@@ -13,7 +13,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Warning</title>
+<title id="popupTitle"></title>
<link rel="shortcut icon" href="../../../../../web/images/favicon.ico"
type="image/x-icon" />
<link rel="stylesheet" type="text/css"
href="../../../../../web/skins/Default/Openbravo_ERP_250.css"
id="paramCSS"></link>
<script language="JavaScript" src="../../../../../web/js/shortcuts.js"
type="text/javascript"></script>
diff -r cae716b1b753 -r e38cdd54b4f3
src/org/openbravo/base/secureApp/AdvisePopUp.xml
--- a/src/org/openbravo/base/secureApp/AdvisePopUp.xml Mon Apr 14 14:38:22
2014 +0200
+++ b/src/org/openbravo/base/secureApp/AdvisePopUp.xml Mon Apr 14 16:48:05
2014 +0200
@@ -13,6 +13,7 @@
<REPORT>
<template file="AdvisePopUp.html"/>
<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"
default="Default"/>
+ <PARAMETER id="popupTitle" name="PopupTitle"/>
<PARAMETER id="paramTipo" name="ParamTipo" replace="ERROR"
attribute="class" />
<PARAMETER id="paramTitulo" name="ParamTitulo"/>
<PARAMETER id="messageBoxIDTitle" name="ParamTitulo"/>
diff -r cae716b1b753 -r e38cdd54b4f3
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Mon Apr
14 14:38:22 2014 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Mon Apr
14 16:48:05 2014 +0200
@@ -76,6 +76,7 @@
import org.openbravo.erpCommon.utility.JRFormatFactory;
import org.openbravo.erpCommon.utility.JRScrollableFieldProviderDataSource;
import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.erpCommon.utility.PrintJRData;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.system.SystemInformation;
@@ -661,6 +662,8 @@
else
myTheme = "Default";
xmlDocument.setParameter("theme", myTheme);
+ xmlDocument.setParameter("PopupTitle",
+ OBMessageUtils.getI18NMessage("OBUIAPP_" + strTipo, null));
xmlDocument.setParameter("ParamTipo", strTipo.toUpperCase());
xmlDocument.setParameter("ParamTitulo", strTitulo);
xmlDocument.setParameter("ParamTexto", strTexto);
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
