lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2025-12-03 06:42:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI - Dont allow empty tag names (#1641)

Browse Source
This commit is contained in:
dgtlmoon
2023-06-22 18:17:41 +02:00
committed by GitHub
parent 0e65dda5b6
commit 8cbf8e8f57
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
changedetectionio/__init__.py
View File

@@ -1364,13 +1364,14 @@ def changedetection_app(config=None, datastore_o=None):
flash("{} watches set to use default notification settings".format(len(uuids))) flash("{} watches set to use default notification settings".format(len(uuids)))
elif (op == 'assign-tag'): elif (op == 'assign-tag'):
op_extradata = request.form.get('op_extradata') op_extradata = request.form.get('op_extradata', '').strip()
tag_uuid = datastore.add_tag(name=op_extradata) if op_extradata:
if op_extradata and tag_uuid: tag_uuid = datastore.add_tag(name=op_extradata)
for uuid in uuids: if op_extradata and tag_uuid:
uuid = uuid.strip() for uuid in uuids:
if datastore.data['watching'].get(uuid): uuid = uuid.strip()
datastore.data['watching'][uuid]['tags'].append(tag_uuid) if datastore.data['watching'].get(uuid):
datastore.data['watching'][uuid]['tags'].append(tag_uuid)
flash("{} watches assigned tag".format(len(uuids))) flash("{} watches assigned tag".format(len(uuids)))

5
changedetectionio/store.py
View File

@@ -566,9 +566,12 @@ class ChangeDetectionStore:
return ret return ret
def add_tag(self, name): def add_tag(self, name):
print (">>> Adding new tag -", name)
# If name exists, return that # If name exists, return that
n = name.strip().lower() n = name.strip().lower()
print (f">>> Adding new tag - '{n}")
if not n:
return False
for uuid, tag in self.__data['settings']['application'].get('tags', {}).items(): for uuid, tag in self.__data['settings']['application'].get('tags', {}).items():
if n == tag.get('title', '').lower().strip(): if n == tag.get('title', '').lower().strip():
print (f">>> Tag {name} already exists") print (f">>> Tag {name} already exists")