[Python-modules-commits] [drf-fsm-transitions] 03/05: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository drf-fsm-transitions.

commit 508f69f18ece72bdb5b5754838337dd71c6f6d73
Merge: 578a90e 92a8cf7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Jan 20 20:57:02 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...d-name-to-work-with-latest-django-fsm-API.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 drf_fsm_transitions/viewset_mixins.py              |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 04daf2c,0000000..8bdf2b2
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 5ad9e63352150f8e09d68e17c319878a9e4312a6
- 5ad9e63352150f8e09d68e17c319878a9e4312a6
++92a8cf7a5a5ea96f0932196200be312d548f82a4
++92a8cf7a5a5ea96f0932196200be312d548f82a4
 +5ad9e63352150f8e09d68e17c319878a9e4312a6
 +5ad9e63352150f8e09d68e17c319878a9e4312a6
 +drf-fsm-transitions_0.2.0.orig.tar.gz
 +7eba11af77fe59bbd73496e33a26ef16f6015cb6
 +2529
diff --cc debian/patches/0001-Fix-method-name-to-work-with-latest-django-fsm-API.patch
index 0000000,0000000..8f1c749
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-method-name-to-work-with-latest-django-fsm-API.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 92a8cf7a5a5ea96f0932196200be312d548f82a4 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 20 Jan 2016 20:56:42 +0100
++Subject: Fix method name to work with latest django-fsm API.
++
++---
++ drf_fsm_transitions/viewset_mixins.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/drf_fsm_transitions/viewset_mixins.py b/drf_fsm_transitions/viewset_mixins.py
++index 7329d03..a0ec877 100644
++--- a/drf_fsm_transitions/viewset_mixins.py
+++++ b/drf_fsm_transitions/viewset_mixins.py
++@@ -33,7 +33,7 @@ def get_viewset_transition_action_mixin(model):
++     class Mixin(object):
++         save_after_transition = True
++ 
++-    transitions = instance.get_all_status_transitions()
+++    transitions = instance.get_all_state_transitions()
++     transition_names = set(x.name for x in transitions)
++     for transition_name in transition_names:
++         setattr(
diff --cc debian/patches/series
index 0000000,0000000..b44493f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-method-name-to-work-with-latest-django-fsm-API.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/drf-fsm-transitions.git