[Testbot] Plone 5.0 - Python 2.7 - Build # 1487 - Regression! - 1 failure(s)
jenkins at plone.org
jenkins at plone.org
Wed Feb 12 11:18:54 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1487 - Failure!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1487/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.formwidget.recurrence
Branch: refs/heads/master
Date: 2014-02-12T02:10:59-08:00
Author: Johannes Raggam (thet) <raggam-nl at adm.at>
Commit: https://github.com/plone/plone.formwidget.recurrence/commit/f87cff1460392a533a1081b184d5bcceae7903b6
formating
Files changed:
M plone/formwidget/recurrence/at/widget.py
M plone/formwidget/recurrence/z3cform/widget.py
diff --git a/plone/formwidget/recurrence/at/widget.py b/plone/formwidget/recurrence/at/widget.py
index 873d645..1dbea17 100644
--- a/plone/formwidget/recurrence/at/widget.py
+++ b/plone/formwidget/recurrence/at/widget.py
@@ -24,7 +24,7 @@ class RecurrenceWidget(LinesWidget):
'startFieldDay': '',
'first_day': '',
'show_repeat_forever': True,
- })
+ })
def get_recurrenceinput_params(self):
portal = getToolByName(getSite(), 'portal_url').getPortalObject()
@@ -34,16 +34,16 @@ def get_recurrenceinput_params(self):
first_day = safe_callable(first_day) and first_day() or first_day,
params = dict(
+ ajaxContentType='application/x-www-form-urlencoded; charset=UTF-8',
+ ajaxURL=ajax_url,
+ firstDay=first_day,
+ hasRepeatForeverButton=self.show_repeat_forever,
lang=request.LANGUAGE,
+ ributtonExtraClass='allowMultiSubmit',
+ startField=self.startField,
startFieldDay=self.startFieldDay,
startFieldMonth=self.startFieldMonth,
startFieldYear=self.startFieldYear,
- startField=self.startField,
- firstDay=first_day,
- ajaxURL=ajax_url,
- ajaxContentType='application/x-www-form-urlencoded; charset=UTF-8',
- ributtonExtraClass='allowMultiSubmit',
- hasRepeatForeverButton=self.show_repeat_forever
)
return params
diff --git a/plone/formwidget/recurrence/z3cform/widget.py b/plone/formwidget/recurrence/z3cform/widget.py
index f0c1c59..1b9b31b 100644
--- a/plone/formwidget/recurrence/z3cform/widget.py
+++ b/plone/formwidget/recurrence/z3cform/widget.py
@@ -54,14 +54,14 @@ def get_recurrenceinput_params(self):
portal = getToolByName(getSite(), 'portal_url').getPortalObject()
ajax_url = portal.absolute_url() + '/@@json_recurrence'
params = dict(
+ ajaxContentType='application/x-www-form-urlencoded; charset=UTF-8',
+ ajaxURL=ajax_url,
+ firstDay=self.first_day(),
+ hasRepeatForeverButton=self.show_repeat_forever,
lang=self.request.LANGUAGE,
readOnly=self.read_only(),
+ ributtonExtraClass='allowMultiSubmit',
startField=self.get_start_field(),
- firstDay=self.first_day(),
- hasRepeatForeverButton=self.show_repeat_forever,
- ajaxURL=ajax_url,
- ajaxContentType='application/x-www-form-urlencoded; charset=UTF-8',
- ributtonExtraClass='allowMultiSubmit'
)
return params
Repository: plone.formwidget.recurrence
Branch: refs/heads/master
Date: 2014-02-12T02:13:00-08:00
Author: Johannes Raggam (thet) <raggam-nl at adm.at>
Commit: https://github.com/plone/plone.formwidget.recurrence/commit/bc3a0cb2e6391fe7d3a9784ea24aa85f5476d88b
Fix Problem in AT based widget with a wrong first_day offset, where it didn't display weekdays properly. Fixes #10.
Files changed:
M CHANGES.rst
M plone/formwidget/recurrence/at/widget.py
diff --git a/CHANGES.rst b/CHANGES.rst
index eb122c4..e49c687 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,10 +4,14 @@ Changelog
1.2.dev (unreleased)
--------------------
+- Fix Problem in AT based widget with a wrong first_day offset, where it didn't
+ display weekdays properly. Fixes #10.
+ [thet]
+
- Replace test dependency on plone.formwidget.datetime with plone.app.z3cform.
[amleczko]
-- Added basque translation
+- Added basque translation.
[erral]
- Add some missing german translations.
diff --git a/plone/formwidget/recurrence/at/widget.py b/plone/formwidget/recurrence/at/widget.py
index 1dbea17..58dc602 100644
--- a/plone/formwidget/recurrence/at/widget.py
+++ b/plone/formwidget/recurrence/at/widget.py
@@ -31,7 +31,7 @@ def get_recurrenceinput_params(self):
ajax_url = portal.absolute_url() + '/@@json_recurrence'
request = portal.REQUEST
first_day = self.first_day
- first_day = safe_callable(first_day) and first_day() or first_day,
+ first_day = safe_callable(first_day) and first_day() or first_day
params = dict(
ajaxContentType='application/x-www-form-urlencoded; charset=UTF-8',
Repository: plone.formwidget.recurrence
Branch: refs/heads/master
Date: 2014-02-12T02:32:11-08:00
Author: Johannes Raggam (thet) <raggam-nl at adm.at>
Commit: https://github.com/plone/plone.formwidget.recurrence/commit/d32cf1834738dc8aae6dfa78dbad49bec9d34261
housekeeping
Files changed:
M CHANGES.rst
M plone/formwidget/recurrence/z3cform/recurrence_input.pt
M plone/formwidget/recurrence/z3cform/widget.py
diff --git a/CHANGES.rst b/CHANGES.rst
index e49c687..913f430 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,10 +24,10 @@ Changelog
1.1 (2013-11-14)
----------------
-- plone.app.widgets compatibility
+- plone.app.widgets compatibility.
[garbas]
-- Add Dutch translation
+- Add Dutch translation.
[khink]
- Show [1-N] in current batch instead of always [1-10]
diff --git a/plone/formwidget/recurrence/z3cform/recurrence_input.pt b/plone/formwidget/recurrence/z3cform/recurrence_input.pt
index 551a126..e6915e1 100644
--- a/plone/formwidget/recurrence/z3cform/recurrence_input.pt
+++ b/plone/formwidget/recurrence/z3cform/recurrence_input.pt
@@ -6,12 +6,7 @@
name view/name;
class view/klass;
style view/style;
- title view/title;
- data-test view/klass;
- data-lang request/LANGUAGE;
- data-readOnly view/read_only;
- data-startField view/get_start_field;
- data-firstDay view/first_day;"
+ title view/title"
tal:content="view/value" />
<tal:block condition="python:view.read_only() == 'true'">
<span style="display:none;" tal:attributes="id string:${view/id}-start;name string:${view/name}-start" tal:content="view/get_start_date"/>
diff --git a/plone/formwidget/recurrence/z3cform/widget.py b/plone/formwidget/recurrence/z3cform/widget.py
index 1b9b31b..58a644f 100644
--- a/plone/formwidget/recurrence/z3cform/widget.py
+++ b/plone/formwidget/recurrence/z3cform/widget.py
@@ -45,7 +45,9 @@ def get_start_date(self):
def first_day(self):
""" First day of the Week. 0..Sunday, 6..Saturday.
- You can overwrite this default value via widget configuration.
+
+ .. Note::
+ This value is likely to be overwritten by the widget configuration.
"""
calendar = self.request.locale.dates.calendars[u'gregorian']
return calendar.week.get('firstDay', 0)
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 7100 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140212/84d00d6d/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 127708 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140212/84d00d6d/attachment-0003.obj>
More information about the Testbot
mailing list