details: https://code.openbravo.com/erp/devel/pi/rev/e8bfaf3a4bfa changeset: 32973:e8bfaf3a4bfa user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Nov 09 13:02:25 2017 +0100 summary: related to issue 37269: removed unused variable
details: https://code.openbravo.com/erp/devel/pi/rev/ec01f8d026a7 changeset: 32974:ec01f8d026a7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Nov 09 13:05:49 2017 +0100 summary: fixes issue 37269: Ability of translating the title of the report result tab diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 21 +++++++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js | 5 +- 2 files changed, 22 insertions(+), 4 deletions(-) diffs (81 lines): diff -r 9f110baef446 -r ec01f8d026a7 modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java Tue Nov 07 19:21:02 2017 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java Thu Nov 09 13:05:49 2017 +0100 @@ -38,6 +38,7 @@ import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; +import org.hibernate.Query; import org.openbravo.base.HttpBaseUtils; import org.openbravo.base.exception.OBException; import org.openbravo.base.model.Entity; @@ -54,6 +55,7 @@ import org.openbravo.base.structure.BaseOBObject; import org.openbravo.client.application.ApplicationConstants; import org.openbravo.client.application.Parameter; +import org.openbravo.client.application.Process; import org.openbravo.client.application.ReportDefinition; import org.openbravo.client.application.process.BaseProcessActionHandler; import org.openbravo.client.application.process.ResponseActionsBuilder.MessageType; @@ -63,6 +65,7 @@ import org.openbravo.client.kernel.reference.UIDefinition; import org.openbravo.client.kernel.reference.UIDefinitionController; import org.openbravo.dal.core.DalContextListener; +import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; import org.openbravo.database.SessionInfo; @@ -342,7 +345,7 @@ final JSONObject reportAction = new JSONObject(); if (expType.equals(ExportType.HTML)) { - recordInfo.put("tabTitle", report.getProcessDefintion().getName()); + recordInfo.put("tabTitle", getResultTabTitle(report.getProcessDefintion())); reportAction.put("OBUIAPP_browseReport", recordInfo); } else { reportAction.put("OBUIAPP_downloadReport", recordInfo); @@ -360,6 +363,22 @@ return ExportType.getExportType(action); } + private String getResultTabTitle(Process processDefinition) { + final StringBuilder query = new StringBuilder(); + query.append("SELECT trl.name FROM OBUIAPP_ProcessTrl trl "); + query.append("WHERE trl.processDefintion.id=:processId "); + query.append("AND trl.language.id=:languageId"); + final Query processTrl = OBDal.getInstance().getSession().createQuery(query.toString()); + processTrl.setParameter("processId", processDefinition.getId()); + processTrl.setParameter("languageId", OBContext.getOBContext().getLanguage().getId()); + processTrl.setMaxResults(1); + String translation = (String) processTrl.uniqueResult(); + if (translation != null) { + return translation; + } + return processDefinition.getName(); + } + /** * Override this method to add validations to the report before it is generated. * diff -r 9f110baef446 -r ec01f8d026a7 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js Tue Nov 07 19:21:02 2017 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js Thu Nov 09 13:05:49 2017 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2012-2016 Openbravo SLU + * All portions are Copyright (C) 2012-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -192,8 +192,7 @@ //* {{{tmpfileName}}}: Name of the temporary file. //* {{{fileName}}}: The name to be used in the file to download. OB.Utilities.Action.set('OBUIAPP_browseReport', function (paramObj) { - var processParameters = paramObj.processParameters, - params = isc.clone(processParameters); + var processParameters = paramObj.processParameters; OB.Layout.ViewManager.openView('OBClassicWindow', { tabTitle: paramObj.tabTitle, addToRecents: false, ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
