Mercurial > hg > MPIWGWeb

comparison MPIWGStaff.py @ 254:c15138774864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with e5b444dab055a3fb2e07f28da4abaff846a9f300
author dwinter
date Tue, 27 May 2014 11:33:57 +0200
parents 065c4284238f 4742e71606e4
children 738129610f36
comparison
equal deleted inserted replaced
253:065c4284238f 254:c15138774864
17 import email 17 import email
18 import re 18 import re
19 import datetime 19 import datetime
20 20
21 from Products.ZDBInterface.ZDBInterfaceFolder import ZDBInterfaceFolder 21 from Products.ZDBInterface.ZDBInterfaceFolder import ZDBInterfaceFolder
22 from Products.MPIWGManager.MPIWGIcsManager import MPIWGIcsManager 22 from Products.MPIWGManager import MPIWGIcsManager
23 23
24 from SrvTxtUtils import getInt, unicodify, utf8ify, sqlName, getPlaintext 24 from SrvTxtUtils import getInt, unicodify, utf8ify, sqlName, getPlaintext
25 import MPIWGHelper 25 import MPIWGHelper
26 26
27 # 27 #
35 """Staff""" 35 """Staff"""
36 pass 36 pass
37 37
38 manage_addMPIWGStaffForm = MPIWGStaff_old.manage_addMPIWGStaffForm 38 manage_addMPIWGStaffForm = MPIWGStaff_old.manage_addMPIWGStaffForm
39 manage_addMPIWGStaff = MPIWGStaff_old.manage_addMPIWGStaff 39 manage_addMPIWGStaff = MPIWGStaff_old.manage_addMPIWGStaff
40
41 # MPIWGManager properties for ICS-calendars
42 # (ID_EN, ID_DE, VALUE_EN, VALUE_DE, WEIGHT, ID)
43 calendar_props = [('Description', 'Beschreibung', None, None, 0, 'description'),
44 ('Location', 'Ort', None, None, 0, 'location'),
45 ('URL', 'URL', None, None, 0, 'url'),
46 ('Time', 'Zeit', None, None, 0, 'time')]
47 40
48 41
49 class MPIWGStaffFolder(ZDBInterfaceFolder): 42 class MPIWGStaffFolder(ZDBInterfaceFolder):
50 """Folder of staff objects""" 43 """Folder of staff objects"""
51 implements(IPublishTraverse) 44 implements(IPublishTraverse)
611 cal_id = "%s_talks"%self.getUsername() 604 cal_id = "%s_talks"%self.getUsername()
612 # use ICS calendar 605 # use ICS calendar
613 cal = self.getTalksCal() 606 cal = self.getTalksCal()
614 if cal is None: 607 if cal is None:
615 # create new calendar 608 # create new calendar
616 cal = MPIWGIcsManager(cal_id, '', url, defaultProps=calendar_props) 609 cal = MPIWGIcsManager.MPIWGIcsManager(cal_id, '', url, defaultProps=MPIWGIcsManager.calendar_props)
617 self.folder.get('calendars')[cal_id] = cal 610 self.folder.get('calendars')[cal_id] = cal
618 611
619 else: 612 else:
620 # calendar exists 613 # calendar exists
621 if cal.url != url: 614 if cal.url != url:
622 # remove and re-create 615 # remove and re-create
623 del self.folder.get('calendars')[cal_id] 616 del self.folder.get('calendars')[cal_id]
624 cal = MPIWGIcsManager(cal_id, '', url, defaultProps=calendar_props) 617 cal = MPIWGIcsManager.MPIWGIcsManager(cal_id, '', url, defaultProps=MPIWGIcsManager.calendar_props)
625 self.folder.get('calendars')[cal_id] = cal 618 self.folder.get('calendars')[cal_id] = cal
626 619
627 # show only upcoming 620 # show only upcoming
628 upcoming = argv.get('only_upcoming', None) 621 upcoming = argv.get('only_upcoming', None)
629 cal.setFlag('only_upcoming', (upcoming == 'yes')) 622 cal.setFlag('only_upcoming', (upcoming == 'yes'))