summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2023-09-14 15:08:10 +0300
committerPhilip Sargent <philip.sargent@gmail.com>2023-09-14 15:08:10 +0300
commit1effc10e3f2364bab59a179bb4270d962e402808 (patch)
tree8f5661feef1023f77d1353d0261a73e9129a38dc
parent85487efee3edbfd13279f59e74c97383dc55b9fd (diff)
downloadtroggle-1effc10e3f2364bab59a179bb4270d962e402808.tar.gz
troggle-1effc10e3f2364bab59a179bb4270d962e402808.tar.bz2
troggle-1effc10e3f2364bab59a179bb4270d962e402808.zip
tidyup of image rotate
-rw-r--r--core/views/uploads.py2
-rw-r--r--parsers/scans.py3
-rw-r--r--templates/renameform.html5
3 files changed, 6 insertions, 4 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py
index 28948c6..dd9f60d 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -423,7 +423,7 @@ def expofilerename(request, filepath):
)
message = f'! - ROTATE - Success: rotated this file {filename}.' + msgdata
print(message)
- DataIssue.objects.create(parser="mogrify", message=message)
+ # DataIssue.objects.create(parser="mogrify", message=message)
if rot.returncode != 0:
msgdata = (
diff --git a/parsers/scans.py b/parsers/scans.py
index 9929209..4cfb7ee 100644
--- a/parsers/scans.py
+++ b/parsers/scans.py
@@ -36,9 +36,10 @@ def load_all_scans():
SingleScan.objects.all().delete()
Wallet.objects.all().delete()
- print(" - deleting all Wallet and SingleScan objects")
+ print(" - deleting all Wallet and SingleScan objects, and resize error messages")
DataIssue.objects.filter(parser="scans").delete()
DataIssue.objects.filter(parser="wallets").delete()
+ DataIssue.objects.filter(parser="mogrify").delete()
# These are valid old file types to be visible, they are not necessarily allowed to be uploaded to a new wallet.
valids = [
diff --git a/templates/renameform.html b/templates/renameform.html
index 1217968..f543057 100644
--- a/templates/renameform.html
+++ b/templates/renameform.html
@@ -24,6 +24,7 @@
<br>
<input class="fancybutton2" style="padding: 0.5em 25px; margin-left: 110px "
+ title="Type in the new name for this file here"
label = "Rename to" name = "renametoname" id="renameto"
pattern="[A-Za-z][A-Za-z0-9_-\.]*"/>
<label
@@ -31,14 +32,14 @@
for="renametoname">type in the new name for this file<br></label>
<br><br><br>
- <button class="fancybutton2" style="padding: 0.5em 25px; margin-left: 110px" name="rename" type = "submit" value = "Rename" >
+ <button class="fancybutton2" style="padding: 0.5em 25px; margin-left: 110px" name="rename" type = "submit" title="Renames the file but disallows certain characters and replaces them, e.g. #, &, ?" value = "Rename" >
Rename it
</button>
</form>
<br />
<form method ='post' >
{% csrf_token %}
- <button class="fancybutton2" style="padding: 0.5em 25px; margin-left: 110px" name="rotate" type = "submit" value = "Rotate" >
+ <button class="fancybutton2" style="padding: 0.5em 25px; margin-left: 110px" name="rotate" type = "submit" title="Rotates 90 degrees clockwise. JPG and PNG files only." value = "Rotate" >
Rotate it
</button>
</form>