products/CPSRSS

changeset 291:3eec2e8dbdd3

Merge from 3.5 branch
author Georges Racinet on ishtar.racinet.fr <georges@racinet.fr>
date Sat, 31 Dec 2011 18:21:58 +0100
parents bc5264a94d66 ae269cbbed26
children edf6b0b34be7
files
diffstat 5 files changed, 39 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/.hgtags
     1.2 +++ b/.hgtags
     1.3 @@ -24,3 +24,5 @@
     1.4  953a6f7452dd7d31f4f5d4a8d5b3c40b56b5a3d4 1.2.1
     1.5  7cb19b17e28d64f16088f3ecb2643c065a632a8c 1.2.2
     1.6  126f641e1c7747fcd208d14e5e3456b73869babb 1.2.3
     1.7 +e7650e20f1cd02dc7db54cb005ddb6f7d312c20b 1.3.0-CPS-3.5
     1.8 +d2a641aef254430b4eba76db3bf43c700d5a33c6 1.3.1-CPS-3.5
     2.1 --- a/HISTORY
     2.2 +++ b/HISTORY
     2.3 @@ -1,3 +1,37 @@
     2.4 +===========================================================
     2.5 +Package: CPSRSS 1.3.1-CPS-3.5
     2.6 +===========================================================
     2.7 +First release built by: gracinet at: 2011-11-23T19:59:09
     2.8 +Requires
     2.9 +~~~~~~~~
    2.10 +-
    2.11 +New features
    2.12 +~~~~~~~~~~~~
    2.13 +-
    2.14 +Bug fixes
    2.15 +~~~~~~~~~
    2.16 +- Protection against missing parameters that cause ERROR messages in the logs.
    2.17 +New internal features
    2.18 +~~~~~~~~~~~~~~~~~~~~~
    2.19 +- 
    2.20 +
    2.21 +===========================================================
    2.22 +Package: CPSRSS 1.3.0-CPS-3.5
    2.23 +===========================================================
    2.24 +First release built by: gracinet at: 2011-09-28T20:54:53
    2.25 +Requires
    2.26 +~~~~~~~~
    2.27 +-
    2.28 +New features
    2.29 +~~~~~~~~~~~~
    2.30 +- Creation of the stable CPS-3.5 branch
    2.31 +Bug fixes
    2.32 +~~~~~~~~~
    2.33 +-
    2.34 +New internal features
    2.35 +~~~~~~~~~~~~~~~~~~~~~
    2.36 +- 
    2.37 +
    2.38  ===========================================================
    2.39  Package: CPSRSS 1.2.3
    2.40  ===========================================================
     3.1 --- a/VERSION
     3.2 +++ b/VERSION
     3.3 @@ -1,5 +1,5 @@
     3.4  #BUNDLEMAN PRODUCT CONFIGURATION FILE
     3.5  # do not edit this file
     3.6  PKG_NAME=CPSRSS
     3.7 -PKG_VERSION=1.2.3
     3.8 +PKG_VERSION=1.3.1-CPS-3.5
     3.9  PKG_RELEASE=1
     4.1 --- a/browser/channels.py
     4.2 +++ b/browser/channels.py
     4.3 @@ -125,7 +125,7 @@
     4.4          max_words = int(kw.get('max_words', 0))
     4.5  
     4.6          data_items = []
     4.7 -        channels_ids = kw.get('channels')
     4.8 +        channels_ids = kw.get('channels', [])
     4.9          for channel_id in channels_ids:
    4.10              if not cont.hasObject(channel_id):
    4.11                  continue
     5.1 --- a/skins/widget_portlet_rss.pt
     5.2 +++ b/skins/widget_portlet_rss.pt
     5.3 @@ -1,4 +1,4 @@
     5.4 -<tal:block define="ds options/datastructure;
     5.5 +<tal:block define="ds options/datastructure|python:{};
     5.6                     export request/form/export|nothing;
     5.7                     portal here/portal_url/getPortalObject;
     5.8                     view nocall:portal/@@channels_restricted;