Skip to content

Commit 6fd4928

Browse files
shibu-narayananQ-Niranjan
authored andcommitted
Merge pull request #320 from vin0dkhichar/17.0-1.3-explore
Fix: After Entitlement approval, Entitlement Approved button must not be clickable
2 parents 3f6cb8f + 6b27f5e commit 6fd4928

5 files changed

Lines changed: 272 additions & 126 deletions

File tree

g2p_programs/views/entitlement_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
4949
/>
5050
<button
5151
type="object"
52-
class="btn btn-dark"
52+
class="btn btn-dark disabled"
5353
icon="fa-thumbs-o-up"
5454
title="Approve entitlement"
5555
name="approve_entitlement"

g2p_reimbursement_portal/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"author": "OpenG2P",
77
"website": "https://openg2p.org",
88
"license": "LGPL-3",
9-
"depends": ["g2p_program_reimbursement", "g2p_agent_portal_base", "g2p_program_cycleless"],
9+
"depends": ["website", "g2p_program_reimbursement", "g2p_agent_portal_base", "g2p_program_cycleless"],
1010
"data": [
1111
"data/g2p_reimbursement_portal_form_data.xml",
1212
"views/g2p_portal_reimbursement.xml",

g2p_social_registry_importer/data/search_criteria.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
<field name="import_registrant_without_id">False</field>
77
<field name="target_registry">group</field>
88
<field name="target_program" />
9+
<field name="query_params">{
10+
"limit": 10000,
11+
"offset": 1000,
12+
"order": "id asc"
13+
}
14+
</field>
915
<field name="output_mapping">{
1016

1117
"name": .name,

0 commit comments

Comments
 (0)