p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.5.x] Fixed #18026 -- Don't return an anonymous dict if extra_data in storage is empty. 

Backport of 97121cb9 from master.
This commit is contained in:
Stephan Jaekel 2013-01-12 12:00:31 +01:00 committed by Claude Paroz
parent b3887ab98a
commit fb130cb40e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/contrib/formtools/tests/wizard/storage.py
View File

@ -75,3 +75,13 @@ class TestStorage(object):
storage.extra_data = extra_context storage.extra_data = extra_context
storage2 = self.get_storage()('wizard2', request, None) storage2 = self.get_storage()('wizard2', request, None)
self.assertEqual(storage2.extra_data, {}) self.assertEqual(storage2.extra_data, {})
def test_extra_context_key_persistence(self):
request = get_request()
storage = self.get_storage()('wizard1', request, None)
self.assertFalse('test' in storage.extra_data)
storage.extra_data['test'] = True
self.assertTrue('test' in storage.extra_data)

2
django/contrib/formtools/wizard/storage/base.py
View File

@ -37,7 +37,7 @@ class BaseStorage(object):
current_step = lazy_property(_get_current_step, _set_current_step) current_step = lazy_property(_get_current_step, _set_current_step)
def _get_extra_data(self): def _get_extra_data(self):
return self.data[self.extra_data_key] or {} return self.data[self.extra_data_key]
def _set_extra_data(self, extra_data): def _set_extra_data(self, extra_data):
self.data[self.extra_data_key] = extra_data self.data[self.extra_data_key] = extra_data