details: https://code.openbravo.com/erp/devel/pi/rev/ebb2e7fa858d changeset: 13429:ebb2e7fa858d user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Aug 01 11:13:20 2011 +0200 summary: 17144: Styling issues for Alerts
details: https://code.openbravo.com/erp/devel/pi/rev/380344cd3377 changeset: 13430:380344cd3377 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Aug 02 09:23:52 2011 +0200 summary: Fixes issue 17548: Cancel button is enabled although you haven't done any change diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diffs (57 lines): diff -r 3dbaa4aed89f -r 380344cd3377 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Thu Aug 04 13:36:49 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 02 09:23:52 2011 +0200 @@ -822,7 +822,7 @@ <!--FF8080812EDE8228012EE38B157A005C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF8080812EDE8228012EE38B157A005C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8080812EDE8228012EE38B157A005C--> <VALUE><![CDATA[OBUIAPP_MoveSelectedToStatus]]></VALUE> -<!--FF8080812EDE8228012EE38B157A005C--> <MSGTEXT><![CDATA[[Move selected to %0]]]></MSGTEXT> +<!--FF8080812EDE8228012EE38B157A005C--> <MSGTEXT><![CDATA[Move selected to %0]]></MSGTEXT> <!--FF8080812EDE8228012EE38B157A005C--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF8080812EDE8228012EE38B157A005C--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF8080812EDE8228012EE38B157A005C--></AD_MESSAGE> diff -r 3dbaa4aed89f -r 380344cd3377 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js Thu Aug 04 13:36:49 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js Tue Aug 02 09:23:52 2011 +0200 @@ -187,7 +187,7 @@ currentStatus: null, initWidget: function () { - this.setTitle(OB.I18N.getLabel('OBUIAPP_MoveSelectedToStatus', [OB.AlertManagement.translatedStatus[this.newStatus]])); + this.setTitle("[ " + OB.I18N.getLabel('OBUIAPP_MoveSelectedToStatus', [OB.AlertManagement.translatedStatus[this.newStatus]]) + " ]"); this.Super('initWidget', arguments); }, diff -r 3dbaa4aed89f -r 380344cd3377 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Thu Aug 04 13:36:49 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Tue Aug 02 09:23:52 2011 +0200 @@ -190,7 +190,7 @@ buttonType: 'undo', prompt: OB.I18N.getLabel('OBUIAPP_CancelEdit'), updateState: function() { - this.setDisabled(this.view.hasNotChanged() && !this.view.viewGrid.hasErrors()); + this.setDisabled(!this.view.viewGrid.hasErrors() && !this.view.viewForm.hasChanged && !this.view.viewGrid.hasChanges()); }, keyboardShortcutId: 'ToolBar_Undo' }, diff -r 3dbaa4aed89f -r 380344cd3377 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Aug 04 13:36:49 2011 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Aug 02 09:23:52 2011 +0200 @@ -19615,7 +19615,7 @@ <!--FF8080812EDE8228012EE384968A0035--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF8080812EDE8228012EE384968A0035--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8080812EDE8228012EE384968A0035--> <VALUE><![CDATA[AlertStatus_Acknowledged]]></VALUE> -<!--FF8080812EDE8228012EE384968A0035--> <MSGTEXT><![CDATA[Acknowledged]]></MSGTEXT> +<!--FF8080812EDE8228012EE384968A0035--> <MSGTEXT><![CDATA[Pending]]></MSGTEXT> <!--FF8080812EDE8228012EE384968A0035--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF8080812EDE8228012EE384968A0035--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--FF8080812EDE8228012EE384968A0035--></AD_MESSAGE> @@ -19626,7 +19626,7 @@ <!--FF8080812EDE8228012EE3854B280039--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF8080812EDE8228012EE3854B280039--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8080812EDE8228012EE3854B280039--> <VALUE><![CDATA[AlertStatus_Suppressed]]></VALUE> -<!--FF8080812EDE8228012EE3854B280039--> <MSGTEXT><![CDATA[Suppressed]]></MSGTEXT> +<!--FF8080812EDE8228012EE3854B280039--> <MSGTEXT><![CDATA[Ignore]]></MSGTEXT> <!--FF8080812EDE8228012EE3854B280039--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF8080812EDE8228012EE3854B280039--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--FF8080812EDE8228012EE3854B280039--></AD_MESSAGE> ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
