Skip to content

Commit

Permalink
fix issues deleting images from dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
inflac committed Jun 15, 2024
1 parent 91aea4d commit 1132f92
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion html/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def sanitize_string(content:str, extend_allowed_chars=False):
str: sanitized string.
"""
pattern = r'a-zA-Z0-9_\-.' # RE pattern with whitelisted chars
if extend_allowd_chars: pattern = r"a-zA-Z0-9_\-.\s"
if extend_allowed_chars: pattern = r"a-zA-Z0-9_\-.\s"
# Replace chars that aren't whitelisted
sanitized_content = re.sub(f'[^{pattern}]', "", content)
return sanitized_content
Expand Down
12 changes: 6 additions & 6 deletions html/templates/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h2>Queued Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='queue/' + image1) }}" alt="{{ image1 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image1 }}">
<input type="hidden" name="file_name" value="{{ image1 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand All @@ -56,7 +56,7 @@ <h2>Queued Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='queue/' + image2) }}" alt="{{ image2 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image2 }}">
<input type="hidden" name="file_name" value="{{ image2 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand All @@ -67,7 +67,7 @@ <h2>Queued Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='queue/' + image3) }}" alt="{{ image3 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image3 }}">
<input type="hidden" name="file_name" value="{{ image3 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand All @@ -92,7 +92,7 @@ <h2>Uploaded Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='uploads/' + image1) }}" alt="{{ image1 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image1 }}">
<input type="hidden" name="file_name" value="{{ image1 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand All @@ -103,7 +103,7 @@ <h2>Uploaded Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='uploads/' + image2) }}" alt="{{ image2 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image2 }}">
<input type="hidden" name="file_name" value="{{ image2 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand All @@ -114,7 +114,7 @@ <h2>Uploaded Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='uploads/' + image3) }}" alt="{{ image3 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image3 }}">
<input type="hidden" name="file_name" value="{{ image3 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion html/templates/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h1>Frequently Asked Questions</h1>
<div class="faq-question">File upload wasn't successful</div>
<div class="faq-answer">
So you are sure you haven't tried to upload something nasty?
Well, you are allowed to upload files that have fileextension of a supported filetype.
Well, you are allowed to upload files that have a file extension of a supported filetype.
If your uploaded file had such an extension than it was rejected because it's content isn't an image.
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion html/templates/management/delete.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h2>Queue Images:</h2>
<div class="image-wrapper">
<img src="{{ url_for('static', filename='queue/' + image1) }}" alt="{{ image1 }}">
<form action="{{ url_for('delete_image') }}" method="POST">
<input type="hidden" name="filename" value="{{ image1 }}">
<input type="hidden" name="file_name" value="{{ image1 }}">
<button type="submit" class="delete-button">Delete</button>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion services/runner/n2i_runner.service
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description=Nextride2-infobeamer
After=network.target

[Service]
ExecStart=/usr/bin/python3 PATH_TO_RUNNER_MAIN -cms CMS_URL
ExecStart=/usr/bin/python3 PATH_TO_RUNNER_MAIN -c CMS_URL
Restart=always
Type=simple

Expand Down

0 comments on commit 1132f92

Please sign in to comment.