From 8feb5cd93e864cedf8976b308f599c89efd97dc7 Mon Sep 17 00:00:00 2001 From: Gaetano D'Onghia Date: Mon, 1 Feb 2021 16:52:28 +0100 Subject: [PATCH 1/2] allow css customization in submitline buttons --- fsm_admin/templates/fsm_admin/fsm_submit_button.html | 2 +- .../fsm_admin/fsm_submit_button_grappelli.html | 2 +- .../templates/fsm_admin/fsm_submit_button_suit.html | 2 +- .../fsm_admin/fsm_submit_button_wpadmin.html | 2 +- fsm_admin/templatetags/fsm_admin.py | 11 +++++++++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/fsm_admin/templates/fsm_admin/fsm_submit_button.html b/fsm_admin/templates/fsm_admin/fsm_submit_button.html index af11b14..ad1ca46 100644 --- a/fsm_admin/templates/fsm_admin/fsm_submit_button.html +++ b/fsm_admin/templates/fsm_admin/fsm_submit_button.html @@ -1 +1 @@ - + diff --git a/fsm_admin/templates/fsm_admin/fsm_submit_button_grappelli.html b/fsm_admin/templates/fsm_admin/fsm_submit_button_grappelli.html index c8d1027..2290421 100644 --- a/fsm_admin/templates/fsm_admin/fsm_submit_button_grappelli.html +++ b/fsm_admin/templates/fsm_admin/fsm_submit_button_grappelli.html @@ -1 +1 @@ -
  • +
  • diff --git a/fsm_admin/templates/fsm_admin/fsm_submit_button_suit.html b/fsm_admin/templates/fsm_admin/fsm_submit_button_suit.html index 1324fad..f16908c 100644 --- a/fsm_admin/templates/fsm_admin/fsm_submit_button_suit.html +++ b/fsm_admin/templates/fsm_admin/fsm_submit_button_suit.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/fsm_admin/templates/fsm_admin/fsm_submit_button_wpadmin.html b/fsm_admin/templates/fsm_admin/fsm_submit_button_wpadmin.html index 6fd022d..536f04c 100644 --- a/fsm_admin/templates/fsm_admin/fsm_submit_button_wpadmin.html +++ b/fsm_admin/templates/fsm_admin/fsm_submit_button_wpadmin.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/fsm_admin/templatetags/fsm_admin.py b/fsm_admin/templatetags/fsm_admin.py index b22a666..2942710 100644 --- a/fsm_admin/templatetags/fsm_admin.py +++ b/fsm_admin/templatetags/fsm_admin.py @@ -31,11 +31,12 @@ def fsm_submit_button(transition): Render a submit button that requests an fsm state transition for a single state. """ - fsm_field_name, button_value, transition_name = transition + fsm_field_name, button_value, transition_name, transition_css_classes = transition return { 'button_value': button_value, 'fsm_field_name': fsm_field_name, 'transition_name': transition_name, + 'transition_css_classes': transition_css_classes, } @@ -62,6 +63,12 @@ def button_name(transition): # Make the function name the button title, but prettier return '{0} {1}'.format(transition.name.replace('_', ' '), model_name).title() + def button_css_classes(transition): + if hasattr(transition, 'custom') and 'css_classes' in transition.custom: + return transition.custom['css_classes'] + else: + return "" + # The model admin defines which field we're dealing with # and has some utils for getting the transitions. request = context['request'] @@ -72,7 +79,7 @@ def button_name(transition): ctx['transitions'] = [] for field, field_transitions in iter(transitions.items()): ctx['transitions'] += sorted( - [(field, button_name(t), t.name) for t in field_transitions], + [(field, button_name(t), t.name, button_css_classes(t)) for t in field_transitions], key=lambda e: e[1], reverse=True ) ctx['perms'] = context['perms'] From ddabd5d5f055be6be6a6d060460be3708ca19cb7 Mon Sep 17 00:00:00 2001 From: Michele Matera Date: Mon, 15 Apr 2024 12:37:44 +0200 Subject: [PATCH 2/2] fix: requirements.txt --- .gitignore | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fb9b373..2f0d685 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ dist *.egg-info docs/_build *.pyc +*.idea .DS_Store db.sqlite3 *.tmp diff --git a/requirements.txt b/requirements.txt index 96f3823..928dfcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Django>=1.6 -django-fsm==2.0.1 +django-fsm>=2.0.1