0031114: New approval message is not validated properly

Description

The new approval messages implemented in changeset https://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/b367392dc5bed7e651b440e3d65ecd5e46d49b94 [^] does not work properly with the function https://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/file/b282d25d0fd0/web/org.openbravo.mobile.core/source/component/obpos-approval.js#l23 [^] that expects as approvalType an string or array of strings

Steps To Reproduce

Currently there is no code in POS that uses this new functionality.
Steps to try this with a preference created on the fly, using developer tools:
Execute the following:
OB.MobileApp.model.attributes.permissions.test_dummy = false;
OB.UTIL.Approval.requestApproval(OB.MobileApp.view.$.containerWindow.$.pointOfSale.model, 'test_dummy', function(approved){if(approved){alert('done');}});
>> Verify that the 'Supervisor Required' popup is shown.
OB.MobileApp.model.attributes.permissions.test_dummy = true;
>> Verify that now the 'done' alert is shown (test_dummy approval granted).
OB.UTIL.Approval.requestApproval(OB.MobileApp.view.$.containerWindow.$.pointOfSale.model, {
  approval: 'test_dummy',
  message: 'test_dummy',
  params: []
}, function(approved){if(approved){alert('done');}});
>> ERROR: 'Supervisor Required' popup is shown, even if we have the permission for 'test_dummy'.

Proposed Solution

see attached patch

Tags

No tags attached.

Attached Files

issue31114.diff [^] (683 bytes) 2015-10-08 18:32 [Show Content] [Hide Content]

diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -1702,7 +1702,8 @@
   },
 
   hasPermission: function (p, checkForAutomaticRoles) {
-    return (!checkForAutomaticRoles && !this.get('context').role.manual) || this.get('permissions')[p];
+    var permission = p.approval ? p.approval : p;
+    return (!checkForAutomaticRoles && !this.get('context').role.manual) || this.get('permissions')[permission];
   },
 
   supportLogClient: function () {

Relationships [ Relation Graph ] [ Dependency Graph ]

related to

feature request

0027002

closed

ebecerra

Extend Approval dialog to allow show custom message on approval dialog.

Notes
(0081100) hgbot (developer) 2015-10-19 18:57	Repository: erp/pmods/org.openbravo.mobile.core Changeset: 2aa4e1c6ba9093a8be2b8c781e0c05e670b2ee33 Author: Adrián Romero <adrianromero <at> openbravo.com> Date: Fri Oct 09 08:36:48 2015 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/2aa4e1c6ba9093a8be2b8c781e0c05e670b2ee33 [^] Fixes issue 0031114: New approval message is not validated properly * Now function hasPermission accepts all type of objects can be used to invoke the function --- M web/org.openbravo.mobile.core/source/model/ob-terminal-model.js ---

Issue History
Date Modified	Username	Field	Change
2015-10-08 18:30	adrianromero	New Issue
2015-10-08 18:30	adrianromero	Assigned To	=> Retail
2015-10-08 18:30	adrianromero	Triggers an Emergency Pack	=> No
2015-10-08 18:30	adrianromero	Relationship added	related to 0027002
2015-10-08 18:32	adrianromero	File Added: issue31114.diff
2015-10-09 08:41	aaroncalero	Steps to Reproduce Updated	View Revisions
2015-10-19 18:57	hgbot	Checkin
2015-10-19 18:57	hgbot	Note Added: 0081100
2015-10-19 18:57	hgbot	Status	new => resolved
2015-10-19 18:57	hgbot	Resolution	open => fixed
2015-10-19 18:57	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/2aa4e1c6ba9093a8be2b8c781e0c05e670b2ee33 [^]
2015-10-20 09:16	marvintm	Assigned To	Retail => adrianromero
2015-10-27 09:13	adrianromero	Review Assigned To	=> marvintm
2015-10-28 16:03	marvintm	Status	resolved => closed
2015-10-28 16:03	marvintm	Fixed in Version	=> RR16Q1