Skip to content

Commit 45d6273

Browse files
committed
[FIX] season actions and land record access
1 parent 6fa8669 commit 45d6273

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

spp_base_farmer_registry/models/farm_season.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ def _compute_show_close_button(self):
103103
if record.state != "active":
104104
record.show_close_button = False
105105
return
106-
record.show_close_button = record.date_end >= fields.Date.today()
106+
# Show normal close button when season has ended or is ending today
107+
record.show_close_button = record.date_end <= fields.Date.today()
107108

108109
@api.depends("date_end")
109110
def _compute_show_force_close_button(self):
@@ -114,7 +115,8 @@ def _compute_show_force_close_button(self):
114115
if record.state != "active":
115116
record.show_force_close_button = False
116117
return
117-
record.show_force_close_button = record.date_end < fields.Date.today()
118+
# Show force close button when season hasn't ended yet
119+
record.show_force_close_button = record.date_end > fields.Date.today()
118120

119121
@api.depends("activity_ids")
120122
def _compute_activity_count(self):

spp_land_record/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"maintainers": ["jeremi", "gonzalesedwin1123", "reichie020212"],
1414
"depends": [
1515
"base",
16+
"spp_base_common",
1617
"spp_base_gis",
1718
"g2p_registry_base",
1819
],
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
22
spp_land_record_admin,Land Record Details Admin Access,spp_land_record.model_spp_land_record,g2p_registry_base.group_g2p_admin,1,1,1,1
33
spp_land_record_registrar,Land Record Details Registrar Access,spp_land_record.model_spp_land_record,g2p_registry_base.group_g2p_registrar,1,1,1,1
4+
5+
spp_land_record_read_access,Land Record Details Read Access,spp_land_record.model_spp_land_record,spp_base_common.read_registry,1,0,0,0
6+
spp_land_record_write_access,Land Record Details Write Access,spp_land_record.model_spp_land_record,spp_base_common.write_registry,1,1,0,1
7+
spp_land_record_write_access,Land Record Details Write Access,spp_land_record.model_spp_land_record,spp_base_common.create_registry,1,0,1,0

0 commit comments

Comments
 (0)