darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-18 03:31:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change error message, the folder id is not useful infomation to the user.

Browse Source
This commit is contained in:
Rebecca Law
2018-11-12 15:25:48 +00:00
parent d4506f7825
commit 83d720bb7b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/template_folder/rest.py
View File

@@ -141,9 +141,7 @@ def move_to_template_folder(service_id, target_template_folder_id=None):
def _validate_folder_move(target_template_folder, target_template_folder_id, template_folder, template_folder_id):
if str(target_template_folder_id) == str(template_folder_id):
msg = 'Could not move to folder: {} to itself'.format(
template_folder_id
)
msg = 'Could not move to folder to itself'
raise InvalidRequest(msg, status_code=400)
if target_template_folder and template_folder.is_parent_of(target_template_folder):
msg = 'Could not move to folder: {} is an ancestor of target folder {}'.format(

2
tests/app/template_folder/test_template_folder_rest.py
View File

@@ -343,7 +343,7 @@ def test_move_to_folder_itself_is_rejected(admin_request, sample_service):
},
_expected_status=400
)
response['message'] == 'Could not move to folder: {} to itself'.format(target_folder.id)
assert response['message'] == 'Could not move to folder to itself'
def test_move_to_folder_skips_archived_templates(admin_request, sample_service):