@@ -851,7 +851,7 @@ def test_history_view__no_perms_enforce_history_permissions(self):
851
851
self .assertEqual (resp .status_code , 403 )
852
852
853
853
@override_settings (
854
- SIMPLE_HISTORY_REVERT_DISABLED = False ,
854
+ SIMPLE_HISTORY_REVERT_DISABLED = True ,
855
855
SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS = True ,
856
856
)
857
857
def test_history_view__enforce_history_permissions_and_revert_enabled (self ):
@@ -879,7 +879,10 @@ def get_request(usr):
879
879
880
880
# no perms
881
881
request = get_request (user )
882
+ self .assertFalse (admin .has_view_permission (request ))
883
+ self .assertFalse (admin .has_change_permission (request ))
882
884
self .assertFalse (admin .has_view_history_permission (request ))
885
+ self .assertFalse (admin .has_change_history_permission (request ))
883
886
884
887
# has concrete view/change only -> view_historical is false
885
888
user .user_permissions .clear ()
@@ -888,7 +891,10 @@ def get_request(usr):
888
891
Permission .objects .get (codename = "change_planet" ),
889
892
)
890
893
request = get_request (user )
894
+ self .assertTrue (admin .has_view_permission (request ))
895
+ self .assertTrue (admin .has_change_permission (request ))
891
896
self .assertEqual (admin .has_view_history_permission (request ), not enforced )
897
+ self .assertEqual (admin .has_change_history_permission (request ), not enforced )
892
898
893
899
# has concrete view/change and historical change -> view_history is false
894
900
user .user_permissions .clear ()
@@ -898,7 +904,10 @@ def get_request(usr):
898
904
Permission .objects .get (codename = "change_historicalplanet" ),
899
905
)
900
906
request = get_request (user )
907
+ self .assertTrue (admin .has_view_permission (request ))
908
+ self .assertTrue (admin .has_change_permission (request ))
901
909
self .assertEqual (admin .has_view_history_permission (request ), not enforced )
910
+ self .assertTrue (admin .has_change_history_permission (request ))
902
911
903
912
# has concrete view/change and historical view/change -> view_history is true
904
913
user .user_permissions .clear ()
@@ -909,15 +918,21 @@ def get_request(usr):
909
918
Permission .objects .get (codename = "change_historicalplanet" ),
910
919
)
911
920
request = get_request (user )
921
+ self .assertTrue (admin .has_view_permission (request ))
922
+ self .assertTrue (admin .has_change_permission (request ))
912
923
self .assertTrue (admin .has_view_history_permission (request ))
924
+ self .assertTrue (admin .has_change_history_permission (request ))
913
925
914
926
# has historical view only -> view_history is true
915
927
user .user_permissions .clear ()
916
928
user .user_permissions .add (
917
929
Permission .objects .get (codename = "view_historicalplanet" ),
918
930
)
919
931
request = get_request (user )
932
+ self .assertFalse (admin .has_view_permission (request ))
933
+ self .assertFalse (admin .has_change_permission (request ))
920
934
self .assertEqual (admin .has_view_history_permission (request ), enforced )
935
+ self .assertFalse (admin .has_change_history_permission (request ))
921
936
922
937
@override_settings (SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS = True )
923
938
def test_permission_combos__enforce_history_permissions (self ):
0 commit comments