r252710 - in Products.mediaEvent/trunk: . Products/mediaEvent/content Products/mediaEvent/profiles/default docs

Author: davidjonas
Date: Thu Dec 12 22:24:49 2013
New Revision: 252710

Modified:
   Products.mediaEvent/trunk/Products/mediaEvent/content/mediaevent.py
   Products.mediaEvent/trunk/Products/mediaEvent/profiles/default/metadata.xml
   Products.mediaEvent/trunk/docs/HISTORY.txt
   Products.mediaEvent/trunk/setup.py
Log:
changing branches back to master. major fuckup...

Modified: Products.mediaEvent/trunk/Products/mediaEvent/content/mediaevent.py
==============================================================================
--- Products.mediaEvent/trunk/Products/mediaEvent/content/mediaevent.py	(original)
+++ Products.mediaEvent/trunk/Products/mediaEvent/content/mediaevent.py	Thu Dec 12 22:24:49 2013
@@ -13,22 +13,44 @@
 from Products.CMFCore.permissions import ModifyPortalContent, View
 from Products.Archetypes.atapi import CalendarWidget
 from Products.Archetypes.atapi import StringWidget
-from Products.Archetypes.atapi import TextAreaWidget
 from Products.Archetypes.atapi import BooleanWidget
 from Products.ATContentTypes import ATCTMessageFactory as _
-from Products.DataGridField import DataGridField, DataGridWidget
-from Products.DataGridField.Column import Column
 from DateTime.DateTime import *
-#from plone.app.event.at.interfaces import IATEvent, IATEventRecurrence
 
 # -*- Message Factory Imported Here -*-
 
 from Products.mediaEvent.interfaces import IMediaEvent
 from Products.mediaEvent.config import PROJECTNAME
 
-MediaEventSchema = folder.ATFolderSchema.copy() + event.ATEventSchema.copy() + atapi.Schema((
+MediaEventSchema = folder.ATFolderSchema.copy() + document.ATDocumentSchema.copy() + atapi.Schema((
 
     # -*- Your Archetypes field definitions here ... -*-
+    DateTimeField('startDate',
+        required=True,
+        searchable=False,
+        accessor='start',
+        write_permission = ModifyPortalContent,
+        default_method = 'getDefaultTime',
+        languageIndependent=True,
+        widget = CalendarWidget(
+              description= '',
+              label=_(u'label_event_start', default=u'Event Starts'),
+              starting_year = 1999
+              )),
+
+    DateTimeField('endDate',
+        required=True,
+        searchable=False,
+        accessor='end',
+        write_permission = ModifyPortalContent,
+        default_method = 'getDefaultTime',
+        languageIndependent=True,
+        widget = CalendarWidget(
+              description = '',
+              label = _(u'label_event_end', default=u'Event Ends'),
+              starting_year = 1999
+              )),
+    
      StringField('exceptions',
         searchable=False,
         write_permission = ModifyPortalContent,
@@ -82,8 +104,6 @@
             description = 'Include location, capacity, comp allocation requests, an account code & details of split (where relevant), and how people can attend (eg. is it drop-in, free but booking essential, standard ticketing?). Also essential that you give booker info on content/age restrictions/standing/strobes etc.',
             label = _(u'label_event_notes', default=u'Event Box Office Information')
             )),
-      
-      
 ))
 
 # Set storage on fields copied from ATFolderSchema, making sure
@@ -92,13 +112,12 @@
 MediaEventSchema['title'].storage = atapi.AnnotationStorage()
 MediaEventSchema['description'].storage = atapi.AnnotationStorage() 
 MediaEventSchema['text'].storage = atapi.AnnotationStorage()
-MediaEventSchema['exceptions'].storage = atapi.AnnotationStorage()
-MediaEventSchema['location'].storage = atapi.AnnotationStorage()
 MediaEventSchema['startDate'].storage = atapi.AnnotationStorage()
 MediaEventSchema['endDate'].storage = atapi.AnnotationStorage()
+MediaEventSchema['exceptions'].storage = atapi.AnnotationStorage()
+MediaEventSchema['location'].storage = atapi.AnnotationStorage()
 MediaEventSchema['notes'].storage = atapi.AnnotationStorage()
 
-
 MediaEventSchema.moveField('startDate', before='text')
 MediaEventSchema.moveField('endDate', before='text')
 MediaEventSchema.moveField('exceptions', before='text')
@@ -111,31 +130,26 @@
 )
 
 
-class MediaEvent(folder.ATFolder, event.ATEvent):
+class MediaEvent(folder.ATFolder):
     """Event type that has a folderish behaviour to store media related to the event."""
     implements(IMediaEvent)
 
     meta_type = "MediaEvent"
     schema = MediaEventSchema
     schema['relatedItems'].widget.visible['edit'] = 'visible'
-    schema['attendees'].widget.visible['edit'] = 'hidden'
-    schema['contactName'].widget.visible['edit'] = 'hidden'
-    schema['contactEmail'].widget.visible['edit'] = 'hidden'
-    schema['contactPhone'].widget.visible['edit'] = 'hidden'
-    schema['eventUrl'].widget.visible['edit'] = 'hidden'
-    #TODO: Set default timezone and hide the widget
-    #schema['timezone'].widget.visible['edit'] = 'hidden'
+
 
     title = atapi.ATFieldProperty('title')
     description = atapi.ATFieldProperty('description')
     text = atapi.ATFieldProperty('text')
+    startDate = atapi.ATFieldProperty('startDate')
+    endDate = atapi.ATFieldProperty('endDate')
     exceptions = atapi.ATFieldProperty('exceptions')
     location = atapi.ATFieldProperty('location')
     notes = atapi.ATFieldProperty('notes')
     
-    
     def getDefaultTime(self):
-            return DateTime()
+        return DateTime()
 
     # -*- Your ATSchema to Python Property Bridges Here ... -*-
 

Modified: Products.mediaEvent/trunk/Products/mediaEvent/profiles/default/metadata.xml
==============================================================================
--- Products.mediaEvent/trunk/Products/mediaEvent/profiles/default/metadata.xml	(original)
+++ Products.mediaEvent/trunk/Products/mediaEvent/profiles/default/metadata.xml	Thu Dec 12 22:24:49 2013
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>0.10</version>
+  <version>0.11</version>
 </metadata>

Modified: Products.mediaEvent/trunk/docs/HISTORY.txt
==============================================================================
--- Products.mediaEvent/trunk/docs/HISTORY.txt	(original)
+++ Products.mediaEvent/trunk/docs/HISTORY.txt	Thu Dec 12 22:24:49 2013
@@ -1,16 +1,20 @@
 Changelog
 =========
+0.11 (2013-12-12)
+---------------------
+- just version number for a new release.
+
 0.10 (2013-12-12)
 ---------------------
-- More dependencies on plone.app.event
+- Switched branches back to master afer problems with recurrence and plone.app.event 
 
 0.9 (2013-12-12)
 ---------------------
-- Fixed dependency on plone.app.event
+- Removed plone.app.event references
 
 0.8 (2013-12-12)
 ---------------------
-- Added a private notes field. 
+- Added field for notes.
 
 0.7 (2013-01-30)
 ---------------------

Modified: Products.mediaEvent/trunk/setup.py
==============================================================================
--- Products.mediaEvent/trunk/setup.py	(original)
+++ Products.mediaEvent/trunk/setup.py	Thu Dec 12 22:24:49 2013
@@ -9,7 +9,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '0.10'
+version = '0.11'
 
 long_description = (
     read('README.txt')

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk