From c9ec0aad8abb977a0be3750dd4efc456797cf1cb Mon Sep 17 00:00:00 2001 From: Ross Mountjoy Date: Thu, 19 Mar 2020 19:38:15 -0400 Subject: [PATCH 1/4] fixed critical bug with the tags --- dashmachine/sources.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dashmachine/sources.py b/dashmachine/sources.py index 4522931..9c8152e 100644 --- a/dashmachine/sources.py +++ b/dashmachine/sources.py @@ -86,8 +86,11 @@ def context_processor(): tags += app_db.tags.split(",") tags_form = TagsForm() + tags = [tag.strip() for tag in tags] + for tag in tags: + if tags.count(tag) > 1: + tags.remove(tag) tags_form.tags.choices += [(tag, tag) for tag in tags] - print(tags_form.tags.choices) settings = Settings.query.first() if settings.background == "random": if len(os.listdir(backgrounds_images_folder)) < 1: From fddd5f8e79b0230649ce31411630c78fac7d0563 Mon Sep 17 00:00:00 2001 From: Ross Mountjoy Date: Thu, 19 Mar 2020 19:53:53 -0400 Subject: [PATCH 2/4] fixed critical bug with the tags --- dashmachine/sources.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dashmachine/sources.py b/dashmachine/sources.py index 9c8152e..1578772 100644 --- a/dashmachine/sources.py +++ b/dashmachine/sources.py @@ -87,9 +87,7 @@ def context_processor(): tags_form = TagsForm() tags = [tag.strip() for tag in tags] - for tag in tags: - if tags.count(tag) > 1: - tags.remove(tag) + tags = list(dict.fromkeys(tags)) tags_form.tags.choices += [(tag, tag) for tag in tags] settings = Settings.query.first() if settings.background == "random": From 3bd607a33d4b2b89430e8eb648e787813ddc345e Mon Sep 17 00:00:00 2001 From: Ross Mountjoy Date: Fri, 20 Mar 2020 09:09:25 -0400 Subject: [PATCH 3/4] fixed another critical bug with the tags --- dashmachine/sources.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dashmachine/sources.py b/dashmachine/sources.py index 1578772..6055ccd 100644 --- a/dashmachine/sources.py +++ b/dashmachine/sources.py @@ -83,11 +83,13 @@ def context_processor(): app_db.groups = None if check_groups(app_db.groups, current_user): apps.append(app_db) - tags += app_db.tags.split(",") + if app_db.tags: + tags += app_db.tags.split(",") tags_form = TagsForm() - tags = [tag.strip() for tag in tags] - tags = list(dict.fromkeys(tags)) + if len(tags) > 0: + tags = [tag.strip() for tag in tags] + tags = list(dict.fromkeys(tags)) tags_form.tags.choices += [(tag, tag) for tag in tags] settings = Settings.query.first() if settings.background == "random": From 0d372762e2c6b2aef232aba1ee7e77c945d41ceb Mon Sep 17 00:00:00 2001 From: sportivaman <34513134+rmountjoy92@users.noreply.github.com> Date: Fri, 20 Mar 2020 09:18:49 -0400 Subject: [PATCH 4/4] Update README.md fixes #44 --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 159f5cd..3907417 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # DashMachine ### Another web application bookmark dashboard, with fun features. +## Before Installing +Please read the latest update post: https://redd.it/flubzn + ![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot1.png) ![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot2.png) @@ -46,7 +49,7 @@ Instructions are for linux. ``` virtualenv --python=python3 DashMachineEnv cd DashMachineEnv && source bin/activate -git clone https://git.wolf-house.net/ross/DashMachine.git +git clone https://github.com/rmountjoy92/DashMachine.git cd DashMachine && pip install -r requirements.txt python3 run.py ```