File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed
main/test_files/local_unit
notifications/templates/email/local_units Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -1057,11 +1057,11 @@ def setUp(self):
1057
1057
global_group .permissions .add (global_permission )
1058
1058
self .global_validator_user .groups .add (global_group )
1059
1059
1060
- file_path = os .path .join (settings .TEST_DIR , "local_unit/final-ad .csv" )
1060
+ file_path = os .path .join (settings .TEST_DIR , "local_unit/test .csv" )
1061
1061
with open (file_path , "rb" ) as f :
1062
1062
self ._file_content = f .read ()
1063
1063
1064
- def create_upload_file (self , filename = "final-ad .csv" ):
1064
+ def create_upload_file (self , filename = "test .csv" ):
1065
1065
"""
1066
1066
Always return a new file instance to prevent stream exhaustion.
1067
1067
"""
Original file line number Diff line number Diff line change @@ -73,7 +73,7 @@ class PrivateLocalUnitViewSet(viewsets.ModelViewSet):
73
73
"level" ,
74
74
)
75
75
.exclude (is_deprecated = True )
76
- .order_by ("validated" , "modified_at" )
76
+ .order_by ("validated" , "- modified_at" )
77
77
)
78
78
filterset_class = LocalUnitFilters
79
79
search_fields = (
@@ -403,7 +403,7 @@ class LocalUnitBulkUploadViewSet(
403
403
mixins .ListModelMixin ,
404
404
viewsets .GenericViewSet ,
405
405
):
406
- queryset = LocalUnitBulkUpload .objects .select_related ("country" , "local_unit_type" , "triggered_by" )
406
+ queryset = LocalUnitBulkUpload .objects .select_related ("country" , "local_unit_type" , "triggered_by" ). order_by ( "-triggered_at" )
407
407
permission_classes = [
408
408
permissions .IsAuthenticated ,
409
409
DenyGuestUserPermission ,
File renamed without changes.
Original file line number Diff line number Diff line change @@ -39,13 +39,13 @@ <h3>Dear {{full_name}}</h3>
39
39
40
40
{% if is_validator_regional_admin %}
41
41
< td align ="center " class ="pb-30 ">
42
- The new local unit "{{local_branch_name}}" has been pending validation for over 14 days. Kindly review and validate or delete as necessary.
42
+ The new local unit "{{local_branch_name}}" has been pending validation for over 7 days. Kindly review and validate or delete as necessary.
43
43
</ td >
44
44
{% endif %}
45
45
46
46
{% if is_validator_global_admin %}
47
47
< td align ="center " class ="pb-30 ">
48
- The new local unit "{{local_branch_name}}" has been pending validation for over 28 days and requires your attention. Please review and validate
48
+ The new local unit "{{local_branch_name}}" has been pending validation for over 14 days and requires your attention. Please review and validate
49
49
or delete as necessary.
50
50
</ td >
51
51
{% endif %}
You can’t perform that action at this time.
0 commit comments