diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 19:59:38 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 19:59:38 +0100 |
| commit | 34e2ab88b6a4e33784f1306bae3e27df1b355739 (patch) | |
| tree | c7946c091644647edbb3a4eb27ca5a5bc9def18e /archaeological_files | |
| parent | 1d7b5ef3055236b56ec1e104ab66a6ccc8e3da14 (diff) | |
| parent | d006f284d408ccc00ba5f93ddd845ef2950f0ea3 (diff) | |
| download | Ishtar-34e2ab88b6a4e33784f1306bae3e27df1b355739.tar.bz2 Ishtar-34e2ab88b6a4e33784f1306bae3e27df1b355739.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/ishtar_menu.py | 2 | ||||
| -rw-r--r-- | archaeological_files/tests.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py index 7ed921b2c..21e59a6af 100644 --- a/archaeological_files/ishtar_menu.py +++ b/archaeological_files/ishtar_menu.py @@ -32,6 +32,7 @@ MENU_SECTIONS = [ SectionItem( 'file_management', _(u"Archaeological file"), profile_restriction='files', + css='menu-file', childs=[ MenuItem( 'file_search', _(u"Search"), @@ -81,6 +82,7 @@ MENU_SECTIONS = [ SectionItem( 'dashboard', _(u"Dashboard"), profile_restriction='files', + css='menu-file', childs=[MenuItem('dashboard_main', _(u"General informations"), model=models.File, access_controls=['change_file', 'change_own_file']), diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py index 4a09e1caa..f3419013a 100644 --- a/archaeological_files/tests.py +++ b/archaeological_files/tests.py @@ -87,17 +87,19 @@ class FileTest(TestCase, FileInit): self.item.numeric_reference)) def testCachedLabel(self): - lbls = ['No town', self.item.external_id, - self.item.internal_reference] - lbl = settings.JOINT.join(lbls) - self.assertEqual(self.item.cached_label, lbl) + # localisation fix + lbls = [] + for town_lbl in (u'No town', u'Pas de commune'): + lbls.append(settings.JOINT.join( + [town_lbl, self.item.external_id, + self.item.internal_reference])) + self.assertIn(self.item.cached_label, lbls) default_town = Town.objects.create(name="Paris", numero_insee='75001') self.item.towns.add(default_town) # manually done inside wizards self.item._cached_label_checked = False self.item.save() - lbls[0] = "Paris" - lbl = settings.JOINT.join(lbls) + lbl = lbls[0].replace('No town', 'Paris') self.assertEqual(self.item.cached_label, lbl) def testAddAndGetHistorized(self): |