diff --git a/LDP/lampadas/database/tables/page_i18n/DE.m4 b/LDP/lampadas/database/tables/page_i18n/DE.m4 index 3cbc0b41..3551947d 100644 --- a/LDP/lampadas/database/tables/page_i18n/DE.m4 +++ b/LDP/lampadas/database/tables/page_i18n/DE.m4 @@ -546,7 +546,7 @@ insert([collection], [|collection.name|], [], |tabcollection| ], 1) -insert([news], [|strnews|], [], +insert([news], [News List], [], [ |tabnews| ], 1) diff --git a/LDP/lampadas/database/tables/page_i18n/EN.m4 b/LDP/lampadas/database/tables/page_i18n/EN.m4 index 9405d920..2d2661d7 100644 --- a/LDP/lampadas/database/tables/page_i18n/EN.m4 +++ b/LDP/lampadas/database/tables/page_i18n/EN.m4 @@ -615,7 +615,7 @@ insert([collection], [|collection.name|], [], |tabcollection| ], 1) -insert([news], [|strnews|], [], +insert([news], [News List], [], [ |tabnews| ], 1) diff --git a/LDP/lampadas/database/tables/page_i18n/FR.m4 b/LDP/lampadas/database/tables/page_i18n/FR.m4 index 5f01d502..a04e32f0 100644 --- a/LDP/lampadas/database/tables/page_i18n/FR.m4 +++ b/LDP/lampadas/database/tables/page_i18n/FR.m4 @@ -436,7 +436,7 @@ insert([collection], [|collection.name|], [], |tabcollection| ], 1) -insert([news], [|strnews|], [], +insert([news], [News List], [], [ |tabnews| ], 1) diff --git a/LDP/lampadas/pylib/Tables.py b/LDP/lampadas/pylib/Tables.py index 864b0722..0c58b6a4 100644 --- a/LDP/lampadas/pylib/Tables.py +++ b/LDP/lampadas/pylib/Tables.py @@ -1798,7 +1798,7 @@ class TabNewsItem(Table): box = WOStringIO('
\n' \ '\n' \ '\n' \ - '\n' \ + '\n' \ ' \n' \ ' \n' \ '\n' \ @@ -1806,36 +1806,37 @@ class TabNewsItem(Table): '\n' % (news.id, news.pub_date)) # List the available translations - box.write('
|strnews|
|strpub_date|
|strpub_date|
\n' \ + box.write('
|strtranslations|
\n' \ '') + odd_even = OddEven() for lang in languages.supported_keys(): if not news.news[lang]==None: box.write('\n' \ '\n' \ '\n' \ - '' \ + '' \ ' ' \ ' \n' \ '' - % (news.id, lang, languages[lang].name[uri.lang], news.news[lang])) + % (news.id, lang, odd_even.get_next(), languages[lang].name[uri.lang], news.news[lang])) # Add a new translation box.write('\n' \ '\n' \ - '' \ + '' \ ' ' \ ' \n' \ '' - % (news.id, widgets.lang('', uri.lang, allow_null=0, allow_unsupported=0))) + % (news.id, odd_even.get_next(), widgets.lang('', uri.lang, allow_null=0, allow_unsupported=0))) box.write('
|strtranslations|
|strlanguage|\n' \ ' |strnews|' \ '
%s:
%s:
%s:
%s:
') else: news = NewsItem() box = WOStringIO('
\n' \ '\n' \ - '\n' \ + '\n' \ ' \n' \ ' \n' \ '\n' \ diff --git a/LDP/lampadas/pylib/WebLayer.py b/LDP/lampadas/pylib/WebLayer.py index 711640ff..d5a08cf6 100755 --- a/LDP/lampadas/pylib/WebLayer.py +++ b/LDP/lampadas/pylib/WebLayer.py @@ -230,9 +230,12 @@ class NewsItems(LampadasCollection): class NewsItem: - def __init__(self, id=0, pub_date=now_string()): + def __init__(self, id=0, pub_date=None): self.id = id - self.pub_date = pub_date + if pub_date==None: + self.pub_date = now_string() + else: + self.pub_date = pub_date self.news = LampadasCollection() def load_row(self, row): diff --git a/LDP/lampadas/pylib/data/save.py b/LDP/lampadas/pylib/data/save.py index 8740d902..539ac0fa 100644 --- a/LDP/lampadas/pylib/data/save.py +++ b/LDP/lampadas/pylib/data/save.py @@ -234,7 +234,7 @@ def user(req, username, first_name, middle_name, surname, email, stylesheet, pas def newnews(req, pub_date): newsitem = lampadasweb.news.add(pub_date) - redirect(req, '../../news/' + str(newsitem.id) + referer_lang_ext(req)) + redirect(req, '../../news_edit/' + str(newsitem.id) + referer_lang_ext(req)) def news(req, news_id, pub_date): newsitem = lampadasweb.news[int(news_id)]
|stradd_news|
|strpub_date|
|strpub_date|