ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #830 from ostcar/issue-822

Browse Source 
Use get_active_version in motion.__unicode__()
This commit is contained in:
Oskar Hahn 2013-07-27 15:28:49 -07:00
commit 5fdea2f213
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/motion/models.py
View File

@ -100,7 +100,7 @@ class Motion(SlideMixin, models.Model):
""" """
Return a human readable name of this motion. Return a human readable name of this motion.
""" """
return self.active_version.title return self.get_active_version().title
# TODO: Use transaction # TODO: Use transaction
def save(self, use_version=None, *args, **kwargs): def save(self, use_version=None, *args, **kwargs):

6
tests/motion/test_models.py
View File

@ -146,6 +146,12 @@ class ModelTest(TestCase):
motion.save(use_version=False) motion.save(use_version=False)
self.assertEqual(motion.versions.count(), 2) self.assertEqual(motion.versions.count(), 2)
def test_unicode_with_no_active_version(self):
motion = Motion.objects.create(title='foo', text='bar', identifier='')
motion.active_version = None
motion.save(update_fields=['active_version'])
self.assertEqual(str(motion), 'foo') # motion.__unicode__() did rais an AttributeError
class ConfigTest(TestCase): class ConfigTest(TestCase):
def test_stop_submitting(self): def test_stop_submitting(self):