audrius/rma
1
0
Fork 1
mirror of https://github.com/OCA/rma.git synced 2025-02-16 17:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] rma: portal views access errors

Browse Source 
- Portal mail thread needs token config.
- Unpublished products will raise AccessError on RMAs portal views for
portal users due to record rules.
- Ensure active_id when getting actions in rma, since we could come from
a context that pollutes the expected active rma id.
This commit is contained in:
david
2020-08-17 09:54:42 +02:00
parent aff0d832e2
commit 04299968c6
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rma/models/rma.py
View File

@@ -599,7 +599,10 @@ class Rma(models.Model):
"""Invoked when 'Replace' button in rma form view is clicked.""" """Invoked when 'Replace' button in rma form view is clicked."""
self.ensure_one() self.ensure_one()
self._ensure_can_be_replaced() self._ensure_can_be_replaced()
action = self.env.ref("rma.rma_delivery_wizard_action").read()[0] # Force active_id to avoid issues when coming from smart buttons
# in other models
action = self.env.ref("rma.rma_delivery_wizard_action").with_context(
active_id=self.id).read()[0]
action['name'] = 'Replace product(s)' action['name'] = 'Replace product(s)'
action['context'] = dict(self.env.context) action['context'] = dict(self.env.context)
action['context'].update( action['context'].update(
@@ -615,7 +618,10 @@ class Rma(models.Model):
""" """
self.ensure_one() self.ensure_one()
self._ensure_can_be_returned() self._ensure_can_be_returned()
action = self.env.ref("rma.rma_delivery_wizard_action").read()[0] # Force active_id to avoid issues when coming from smart buttons
# in other models
action = self.env.ref("rma.rma_delivery_wizard_action").with_context(
active_id=self.id).read()[0]
action['context'] = dict(self.env.context) action['context'] = dict(self.env.context)
action['context'].update( action['context'].update(
active_id=self.id, active_id=self.id,
@@ -628,9 +634,12 @@ class Rma(models.Model):
"""Invoked when 'Split' button in rma form view is clicked.""" """Invoked when 'Split' button in rma form view is clicked."""
self.ensure_one() self.ensure_one()
self._ensure_can_be_split() self._ensure_can_be_split()
action = self.env.ref("rma.rma_split_wizard_action").read()[0] # Force active_id to avoid issues when coming from smart buttons
# in other models
action = self.env.ref("rma.rma_split_wizard_action").with_context(
active_id=self.id).read()[0]
action['context'] = dict(self.env.context) action['context'] = dict(self.env.context)
action['context'].update(active_ids=self.ids) action['context'].update(active_id=self.id, active_ids=self.ids)
return action return action
def action_cancel(self): def action_cancel(self):
@@ -663,7 +672,10 @@ class Rma(models.Model):
def action_view_receipt(self): def action_view_receipt(self):
"""Invoked when 'Receipt' smart button in rma form view is clicked.""" """Invoked when 'Receipt' smart button in rma form view is clicked."""
self.ensure_one() self.ensure_one()
action = self.env.ref('stock.action_picking_tree_all').read()[0] # Force active_id to avoid issues when coming from smart buttons
# in other models
action = self.env.ref('stock.action_picking_tree_all').with_context(
active_id=self.id).read()[0]
action.update( action.update(
res_id=self.reception_move_id.picking_id.id, res_id=self.reception_move_id.picking_id.id,
view_mode="form", view_mode="form",
@@ -687,7 +699,8 @@ class Rma(models.Model):
def action_view_delivery(self): def action_view_delivery(self):
"""Invoked when 'Delivery' smart button in rma form view is clicked.""" """Invoked when 'Delivery' smart button in rma form view is clicked."""
action = self.env.ref('stock.action_picking_tree_all').read()[0] action = self.env.ref('stock.action_picking_tree_all').with_context(
active_id=self.id).read()[0]
picking = self.delivery_move_ids.mapped('picking_id') picking = self.delivery_move_ids.mapped('picking_id')
if len(picking) > 1: if len(picking) > 1:
action['domain'] = [('id', 'in', picking.ids)] action['domain'] = [('id', 'in', picking.ids)]

12
rma/views/rma_portal_templates.xml
View File

@@ -50,7 +50,8 @@
</a> </a>
</td> </td>
<td class="d-none d-md-table-cell"><span t-field="rma.date"/></td> <td class="d-none d-md-table-cell"><span t-field="rma.date"/></td>
<td><span t-field="rma.product_id.name"/></td> <!-- Portal users don't have access to unpublished products -->
<td><span t-esc="rma.sudo().product_id.display_name"/></td>
<td class='text-right'><span t-field="rma.product_uom_qty"/></td> <td class='text-right'><span t-field="rma.product_uom_qty"/></td>
<td class="d-none d-md-table-cell tx_status"> <td class="d-none d-md-table-cell tx_status">
<span class="badge badge-pill badge-secondary"><span t-field="rma.state"/></span> <span class="badge badge-pill badge-secondary"><span t-field="rma.state"/></span>
@@ -132,12 +133,14 @@
<span t-field="rma.picking_id"/> <span t-field="rma.picking_id"/>
</div> </div>
</div> </div>
<div t-if="rma.product_id" class="row mb-2 mb-sm-1"> <!-- We need to prevent access errors if the product is
unpublished-->
<div t-if="rma.sudo().product_id" class="row mb-2 mb-sm-1">
<div class="col-12 col-sm-4"> <div class="col-12 col-sm-4">
<strong>Product</strong> <strong>Product</strong>
</div> </div>
<div class="col-12 col-sm-8"> <div class="col-12 col-sm-8">
<span t-field="rma.product_id"/> <span t-esc="rma.sudo().product_id.display_name"/>
</div> </div>
</div> </div>
<div t-if="rma.product_uom_qty" class="row mb-2 mb-sm-1"> <div t-if="rma.product_uom_qty" class="row mb-2 mb-sm-1">
@@ -262,6 +265,9 @@
<h2>Communication</h2> <h2>Communication</h2>
<t t-call="portal.message_thread"> <t t-call="portal.message_thread">
<t t-set="object" t-value="rma"/> <t t-set="object" t-value="rma"/>
<t t-set="token" t-value="rma.access_token"/>
<t t-set="pid" t-value="pid"/>
<t t-set="hash" t-value="hash"/>
</t> </t>
</div> </div>
</t> </t>