Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow css customization in submitline buttons #88

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ dist
*.egg-info
docs/_build
*.pyc
*.idea
.DS_Store
db.sqlite3
*.tmp
Expand Down
2 changes: 1 addition & 1 deletion fsm_admin/templates/fsm_admin/fsm_submit_button.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<input type="submit" value="{{ button_value }}" class="default transition-{{ transition_name }}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}"/>
<input type="submit" value="{{ button_value }}" class="default transition-{{ transition_name }}{% if transition_css_classes %} {{ transition_css_classes }}{% endif %}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}"/>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<li class="grp-float-left submit-button-container"><input type="submit" value="{{ button_value }}" class="default transition-{{ transition_name }}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}"/></li>
<li class="grp-float-left submit-button-container"><input type="submit" value="{{ button_value }}" class="default transition-{{ transition_name }}{% if transition_css_classes %} {{ transition_css_classes }}{% endif %}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}"/></li>
2 changes: 1 addition & 1 deletion fsm_admin/templates/fsm_admin/fsm_submit_button_suit.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<button type="submit" class="btn default transition-{{ transition_name }}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}">{{ button_value }}</button>
<button type="submit" class="btn default transition-{{ transition_name }}{% if transition_css_classes %} {{ transition_css_classes }}{% endif %}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}">{{ button_value }}</button>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<input type="submit" value="{{ button_value }}" class="default transition-{{ transition_name }}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}"/>
<input type="submit" value="{{ button_value }}" class="default transition-{{ transition_name }}{% if transition_css_classes %} {{ transition_css_classes }}{% endif %}" name="_fsmtransition-{{ fsm_field_name }}-{{ transition_name }}"/>
11 changes: 9 additions & 2 deletions fsm_admin/templatetags/fsm_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}


Expand All @@ -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']
Expand All @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=1.6
django-fsm==2.0.1
django-fsm>=2.0.1