Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PROD Release #2283

Merged
merged 25 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0dc2097
remove markup filter tag
depsiatwal Oct 29, 2024
c814295
remove makedown toolbar and date
depsiatwal Oct 29, 2024
62f073c
remove markup option components
depsiatwal Oct 29, 2024
e8fb052
remove markeup helpsection
depsiatwal Oct 29, 2024
2ea1636
remove markeup DetailComponent
depsiatwal Oct 29, 2024
cc37519
remove markdown form
depsiatwal Oct 29, 2024
0df0d9f
remove markdown label
depsiatwal Oct 29, 2024
d66c78e
remove markdown from component
depsiatwal Oct 29, 2024
e5d58be
lint fixes and removed mark_down method
depsiatwal Oct 30, 2024
f0f4c3f
Merge branch 'dev' into LTD-5573-make-makedown-safe-remove
depsiatwal Nov 4, 2024
308f967
Remove trade control related code
kevincarrogan Nov 4, 2024
46c06ae
Remove compliance related code
kevincarrogan Nov 4, 2024
230bb7e
Update siel only flag to statically be true
kevincarrogan Nov 4, 2024
6788cac
Remove checks for feature flag that's always true
kevincarrogan Nov 4, 2024
74d1f6c
Merge branch 'dev' into LTD-5573-make-makedown-safe-remove
depsiatwal Nov 11, 2024
4de330e
Merge remote-tracking branch 'origin/dev' into LTD-5573-make-makedown…
kevincarrogan Dec 18, 2024
d22bc81
Merge pull request #2219 from uktrade/LTD-5573-make-makedown-safe-remove
kevincarrogan Dec 18, 2024
7c9bbcb
fix number of fields that can be submitted
depsiatwal Dec 18, 2024
98e14ff
Merge branch 'dev' into LTD-5734-fix-serial-number-update-error
depsiatwal Dec 18, 2024
cafddfa
Remove usage of unused allure library
kevincarrogan Dec 18, 2024
bfd96b0
Merge pull request #2279 from uktrade/dev
depsiatwal Dec 19, 2024
cc83309
Merge pull request #2274 from uktrade/LTD-5744-remove-unused-library
kevincarrogan Dec 19, 2024
324514b
Merge branch 'dev' into LTD-5734-fix-serial-number-update-error
depsiatwal Dec 19, 2024
7b149bf
Merge pull request #2276 from uktrade/LTD-5734-fix-serial-number-upda…
depsiatwal Dec 19, 2024
90203d9
Merge pull request #2281 from uktrade/dev
depsiatwal Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
allure-pytest = "~=2.6"
allure-python-commons = "~=2.6"
black = "~=24.3.0"
envparse = "~=0.2"
faker = "~=4.0"
Expand Down
137 changes: 24 additions & 113 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion caseworker/cases/forms/attach_documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def attach_documents_form(case_url):
def upload_document_form(queue_pk):
return Form(
UploadEnforcementXML.TITLE,
UploadEnforcementXML.DESCRIPTION,
"",
[
FileUpload(name="file"),
],
Expand Down
6 changes: 3 additions & 3 deletions caseworker/cases/forms/finalise_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def approve_licence_form(queue_pk, case_id, is_open_licence, editable_duration,
title=lite_content.lite_internal_frontend.advice.FinaliseLicenceForm.APPROVE_TITLE,
questions=[
DateInput(
description=lite_content.lite_internal_frontend.advice.FinaliseLicenceForm.DATE_DESCRIPTION,
description="For example, 27 3 2019",
title=lite_content.lite_internal_frontend.advice.FinaliseLicenceForm.DATE_TITLE,
prefix="",
),
Expand Down Expand Up @@ -48,9 +48,9 @@ def approve_licence_form(queue_pk, case_id, is_open_licence, editable_duration,

def deny_licence_form(queue_pk, case_id, is_open_licence, nlr):
if nlr:
description = lite_content.lite_internal_frontend.advice.FinaliseLicenceForm.NLR_DESCRIPTION
description = "You'll be informing the exporter that no licence is required"
else:
description = lite_content.lite_internal_frontend.advice.FinaliseLicenceForm.REFUSE_DESCRIPTION
description = "You'll be denying the case"

return Form(
title=lite_content.lite_internal_frontend.advice.FinaliseLicenceForm.FINALISE_TITLE,
Expand Down
2 changes: 1 addition & 1 deletion caseworker/cases/forms/generate_document.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def select_template_form(templates, back_url):
def select_addressee_form():
return Form(
title=GenerateDocumentsPage.AddresseeForm.TITLE,
description=GenerateDocumentsPage.AddresseeForm.DESCRIPTION,
description="",
questions=[Custom("components/addressee-table.html")],
default_button_name=letter_templates.LetterTemplatesPage.PickTemplate.BUTTON,
container="case",
Expand Down
2 changes: 1 addition & 1 deletion caseworker/cases/forms/move_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
def move_case_form(request: HttpRequest, queue, case: dict):
return Form(
title=Manage.MoveCase.TITLE,
description=Manage.MoveCase.DESCRIPTION,
description="",
questions=[
Filter(),
Checkboxes("queues[]", get_queues(request, convert_to_options=True), filterable=True),
Expand Down
2 changes: 1 addition & 1 deletion caseworker/cases/forms/reissue_ogl_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
def reissue_ogl_confirmation_form(case_id, queue_id):
return Form(
title=Manage.ReissueOGL.TITLE,
description=Manage.ReissueOGL.DESCRIPTION,
description="Doing so will allow the exporter to resume using this open general licence",
questions=[
RadioButtons(
name="confirm",
Expand Down
Loading
Loading