Menu
▾
▴
[Plone-cvs] r36864 - in plone.app.event/trunk: . plone/app/event plone/app/event/browser plone/app/event/tests
|
From: Tom G. <svn...@pl...> - 2010-05-31 17:11:08
|
Author: tom_gross
Date: Mon May 31 17:10:58 2010
New Revision: 36864
Modified:
plone.app.event/trunk/plone/app/event/browser/ical.py
plone.app.event/trunk/plone/app/event/browser/recurrence.pt
plone.app.event/trunk/plone/app/event/event.py
plone.app.event/trunk/plone/app/event/tests/base.py
plone.app.event/trunk/plone/app/event/vocabulary.py
plone.app.event/trunk/setup.py
Log:
removed unused imports
use safeToInt-method in reccurence-widget
Modified: plone.app.event/trunk/plone/app/event/browser/ical.py
==============================================================================
--- plone.app.event/trunk/plone/app/event/browser/ical.py (original)
+++ plone.app.event/trunk/plone/app/event/browser/ical.py Mon May 31 17:10:58 2010
@@ -7,12 +7,11 @@
from plone.memoize import ram
from Products.ATContentTypes.interfaces import IATTopic
-from Products.CMFCore.utils import getToolByName
from plone.app.event.constants import (
PRODID, ICS_HEADER, ICS_FOOTER, ICS_EVENT_START, ICS_EVENT_END)
from plone.app.event.interfaces import ICalendarSupport
-from plone.app.event.utils import n2rn, rfc2445dt, vformat, foldline
+from plone.app.event.utils import rfc2445dt, vformat, foldline
from plone.app.event import event_util
def cachekey(fun, self):
Modified: plone.app.event/trunk/plone/app/event/browser/recurrence.pt
==============================================================================
--- plone.app.event/trunk/plone/app/event/browser/recurrence.pt (original)
+++ plone.app.event/trunk/plone/app/event/browser/recurrence.pt Mon May 31 17:10:58 2010
@@ -29,35 +29,33 @@
</metal:view_macro>
<metal:define define-macro="edit">
- <metal:use use-macro="field_macro|context/widgets/field/macros/edit">
+ <metal:use use-macro="field_macro|context/widgets/field/macros/edit">
- <metal:fill fill-slot="widget_body"
- tal:define="vocab widget/recurrencevoc;
- selection string:">
+ <metal:fill fill-slot="widget_body"
+ tal:define="vocab widget/recurrencevoc;
+ selection string:">
+ <select
+ tal:attributes="name string:${fieldName}-freq;
+ id string:${fieldName}-freq;
+ value python:value and value[0].get('freq', '');">
- <!-- Pulldown when longer -->
- <select tal:attributes="name string:${fieldName}-freq;
- id string:${fieldName}-freq;">
+ <option tal:repeat="item vocab"
+ tal:attributes="value item/token;
+ selected python:item.token in selection and 'selected' or None"
+ tal:content="item/title"
+ />
- <option tal:repeat="item vocab"
- tal:attributes="value item/token;
- selected python:item.token in selection and 'selected' or None"
- tal:content="item/title"
- i18n:translate=""
- />
+ </select>
- </select>
+ <input class="calendarInput" type="text" value=""
+ tal:attributes="name string:${fieldName}-until;
+ id string:${fieldName}-until;
+ value python:value and value[0].get('until', '')" />
+ </metal:fill>
- <input class="calendarInput" type="text" value=""
- tal:attributes="name string:${fieldName}-until;
- id string:${fieldName}-until;
- value string:" />
-
- </metal:fill>
-
- </metal:use>
+ </metal:use>
</metal:define>
Modified: plone.app.event/trunk/plone/app/event/event.py
==============================================================================
--- plone.app.event/trunk/plone/app/event/event.py (original)
+++ plone.app.event/trunk/plone/app/event/event.py Mon May 31 17:10:58 2010
@@ -9,13 +9,13 @@
from DateTime import DateTime
from Products.CMFCore.permissions import ModifyPortalContent, View
+from Products.CMFPlone.utils import safeToInt
from Products.Archetypes.atapi import ATFieldProperty
from Products.Archetypes.atapi import AnnotationStorage
from Products.Archetypes.atapi import BooleanField
from Products.Archetypes.atapi import BooleanWidget
from Products.Archetypes.atapi import DateTimeField
-from Products.Archetypes.atapi import KeywordWidget
from Products.Archetypes.atapi import LinesField
from Products.Archetypes.atapi import LinesWidget
from Products.Archetypes.atapi import ObjectField
@@ -81,8 +81,7 @@
"""Basic impl for form processing in a widget"""
value = {}
- # XXX safe int ???
- freq = int(form.get("%s-freq" % field.getName(), empty_marker))
+ freq = safeToInt(form.get("%s-freq" % field.getName(), empty_marker))
if freq is -1:
freq = None
elif freq:
Modified: plone.app.event/trunk/plone/app/event/tests/base.py
==============================================================================
--- plone.app.event/trunk/plone/app/event/tests/base.py (original)
+++ plone.app.event/trunk/plone/app/event/tests/base.py Mon May 31 17:10:58 2010
@@ -6,7 +6,6 @@
from Products.ATContentTypes.tests.atcttestcase import ATCTFieldTestCase
from Products.ATContentTypes.tests.atctftestcase import ATCTIntegrationTestCase
from Products.PloneTestCase.layer import onsetup
-from Products.PloneTestCase.setup import SiteSetup
# index has to be installed first and not deferred via @onsetup
def setupIndex():
Modified: plone.app.event/trunk/plone/app/event/vocabulary.py
==============================================================================
--- plone.app.event/trunk/plone/app/event/vocabulary.py (original)
+++ plone.app.event/trunk/plone/app/event/vocabulary.py Mon May 31 17:10:58 2010
@@ -1,4 +1,3 @@
-import zope.interface
from Products.CMFDefault.formlib.vocabulary import SimpleVocabulary
from dateutil.rrule import YEARLY, MONTHLY, WEEKLY, DAILY
from Products.ATContentTypes import ATCTMessageFactory as _
Modified: plone.app.event/trunk/setup.py
==============================================================================
--- plone.app.event/trunk/setup.py (original)
+++ plone.app.event/trunk/setup.py Mon May 31 17:10:58 2010
@@ -25,6 +25,7 @@
install_requires=[
'setuptools',
'collective.calendarwidget',
+ 'Plone',
'Products.DateRecurringIndex',
],
extras_require={'test': ['interlude',]},
|