Wiking branch, master, updated. 6186d3e14c4bb03a9b40e0c9fff28dca855472a9

[Tomas Cerha]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Wiking".

The branch, master has been updated
       via  6186d3e14c4bb03a9b40e0c9fff28dca855472a9 (commit)
       via  4304f0ad062565285a93f6e70417c9f55813bad3 (commit)
      from  f349a0cd6700d5791d766161c1a5aee1eaa1d44d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6186d3e14c4bb03a9b40e0c9fff28dca855472a9
Author: Tomas Cerha <cerha at brailcom.org>
Date:   Fri Jun 10 11:36:10 2011 +0200

    Fix typo in datetime.timedelta reference

commit 4304f0ad062565285a93f6e70417c9f55813bad3
Author: Tomas Cerha <cerha at brailcom.org>
Date:   Fri Jun 10 11:30:22 2011 +0200

    Convert mx.DateTime date computation by datetime computation

-----------------------------------------------------------------------

Summary of changes:
 lib/wiking/cms/cms.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/wiking/cms/cms.py b/lib/wiking/cms/cms.py
index 8a81742..2a2caee 100644
--- a/lib/wiking/cms/cms.py
+++ b/lib/wiking/cms/cms.py
@@ -549,7 +549,7 @@ class Session(PytisModule, wiking.Session):
         row = self._data.get_row(uid=user.uid(), session_key=session_key)
         if row:
             now_ = now()
-            expiration = datetime.datetime.timedelta(hours=cfg.session_expiration)
+            expiration = datetime.timedelta(hours=cfg.session_expiration)
             if row['last_access'].value() > now_ - expiration:
                 self._data.update((row['session_id'],), self._data.make_row(last_access=now_))
                 return True
@@ -1838,7 +1838,8 @@ class Planner(News):
             Field('start_date', _("Date"), width=10,
                   type=Date(not_null=True, constraints=(self._check_date,)),
                   descr=_("The date when the planned event begins. Enter the date including year. "
-                          "Example: %(date)s", date=lcg.LocalizableDateTime((now()+7).date))),
+                          "Example: %(date)s",
+                          date=lcg.LocalizableDateTime((datetime.datetime.today()+datetime.timedelta(weeks=1)).date().isoformat()))),
             Field('end_date', _("End date"), width=10, type=Date(), editable=NEVER,
                   descr=_("The date when the event ends if it is not the same as the start date "
                           "(for events which last several days).")),


hooks/post-receive
-- 
Wiking