Changeset 9a0611 in indico for indico/MaKaC/conference.py

Timestamp:

09/15/09 18:59:59 (4 years ago)

Author:

David Martín Clavo <david.martin.clavo@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

63511f

Parents:

b2fe37

git-author:

David Martín Clavo <david.martin.clavo@…> (09/15/09 18:59:58)

git-committer:

David Martín Clavo <david.martin.clavo@…> (09/15/09 18:59:59)

Message:

[FIX/IMPROVEMENT] Several minor Collaboration fixes / improvements

# This is a combination of 11 commits.
# The first commit's message is:
[MINOR] Added @Retrieves to a Contribution's location and room name

# This is the 2nd commit message:

[FIX/IMPROVEMENT] Recording and Webcast Requests changes

-RR: Added mails when requests gets accepted or rejected.
-RR and WR: forward copy of accept / reject mails to admins.
-RR and WR: several minor mail fixes
-RR and WR: refactored how list of talks / webcastable talks is obtained.
-RR and WR: show location / room of event and talks in mails.
-RR and WR: show location / toom of talks in web form.

# This is the 3rd commit message:

[FIX/MINOR] Reviewed EVO and CERNMCU error messages

-Added some error cases when those systems are
offline, or Indico's credentials against those
systems are wrong.
-Reviewed wording of some messages.

# This is the 4th commit message:

[FIX] CERNMCU error messages wording

# This is the 5th commit message:

[FIX] Missing check for no Collaboration plugin type

# This is the 6th commit message:

[MINOR] sorted results of RoomBookingListLocationsAndRooms? service

# This is the 7th commit message:

[MINOR] Catch exception on bad event type name

# This is the 8th commit message:

[MINOR] RR and WR: better text in mail when no talks

# This is the 9th commit message:

[MINOR] RR and WR: Fix on modify request display with 'all talks' selected

# This is the 10th commit message:

[FIX] Bug that prevented trigger actions from being executed

# This is the 11th commit message:

[FIX] CERNMCU IdRangeTrigger? action fix

# This is the 12th commit message:

[FIX] CERNMCU: fixes for room retrieval

-RoomBooking?'s CrossLocationQueries? fails when
passed a location name that does not exist
in the DB

# This is the 13th commit message:

[FIX] CERNMCU: fixed messages when room retrieval problems

# This is the 14th commit message:

[MINOR] AlertPopup? multi-line appearence improvement

File:

• indico/MaKaC/conference.py (modified) (2 diffs)

indico/MaKaC/conference.py

@@ -8339 +8339 @@
         return self.getOwner()
 
+    @Retrieves (['MaKaC.conference.Contribution',
+                 'MaKaC.conference.AcceptedContribution'],'location', lambda l: l and l.getName())
     def getLocation( self ):
         if self.getOwnLocation():
@@ -8354 +8356 @@
         self.notifyModification()
 
+    @Retrieves (['MaKaC.conference.Contribution',
+                 'MaKaC.conference.AcceptedContribution'],'room', lambda r: r and r.getName())
     def getRoom( self ):
         if self.getOwnRoom():