Changeset 2e0cb9c432ec158d01967f65ac8b128f4f64f070 in indico

Timestamp:

01/19/12 14:50:13 (4 months ago)

Author:

Alberto Resco Perez <alberto.resco.perez@…>

Children:

47039282c3fd8f41d8e2d4244f859996497f6938

Parents:

2350f4707861821ebdbf31f16853761d4fd2f2f7

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (01/19/12 14:50:13)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/09/12 15:35:27)

Message:

[IMP] Remove RB bookings associated to an event

• Closes #892.

Location:

indico/MaKaC

Files:

• conference.py (modified) (2 diffs)
• webinterface/rh/categoryMod.py (modified) (3 diffs)
• webinterface/rh/conferenceModif.py (modified) (1 diff)

indico/MaKaC/conference.py

@@ -40 +40 @@
 from MaKaC.common.url import ShortURLMapper
 from MaKaC.contributionReviewing import Review
-from MaKaC.rb_location import CrossLocationQueries
+from MaKaC.rb_location import CrossLocationQueries, CrossLocationDB
 from indico.util.i18n import L_
 
@@ -2741 +2741 @@
 
         self.removeAllEvaluations()
+
+        #Delete the RoomBooking associated reservations
+        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+        if minfo.getRoomBookingModuleActive() and CrossLocationDB.isConnected():
+            for resv in self.getRoomBookingList():
+                resv.remove()
 
         #For each conference we have a list of managers. If we delete the conference but we don't delete

indico/MaKaC/webinterface/rh/categoryMod.py

@@ -33 +33 @@
 import MaKaC.domain as domain
 from MaKaC.common.general import *
-from MaKaC.webinterface.rh.base import RHModificationBaseProtected
+from MaKaC.webinterface.rh.base import RHModificationBaseProtected,\
+    RoomBookingDBMixin
 from MaKaC.errors import MaKaCError,NoReportError,FormValuesError
 #import MaKaC.webinterface.pages.conferences as conferences
@@ -538 +539 @@
 
 
-class RHCategoryActionConferences( RHCategModifBase ):
+class RHCategoryActionConferences( RoomBookingDBMixin, RHCategModifBase ):
     _uh = urlHandlers.UHCategoryActionConferences
 
@@ -667 +668 @@
         self._redirect( urlHandlers.UHCategModifAC.getURL( self._target ) )
 
-class RHCategoryDeletion( RHCategModifBase ):
+class RHCategoryDeletion( RoomBookingDBMixin, RHCategModifBase ):
     _uh = urlHandlers.UHCategoryDeletion
 

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -1532 +1532 @@
             return p.display()
 
-class RHConfDeletion( RHConferenceModifBase ):
+class RHConfDeletion( RoomBookingDBMixin, RHConferenceModifBase ):
     _uh = urlHandlers.UHConfDeletion