Changeset 1ed8d2 in indico

Timestamp:

03/02/12 09:20:59 (15 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

a8889f

Parents:

8f2854

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (03/01/12 18:31:16)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/02/12 09:20:59)

Message:

[FIX] Deleted cloned events vidyo booking

Location:

indico

Files:

• MaKaC/plugins/Collaboration/base.py (modified) (1 diff)
• htdocs/js/indico/Collaboration/Collaboration.js (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/base.py

@@ -745 +745 @@
         for booking in self.getBookingList():
             try:
-                removeResult = booking._delete()
-                if isinstance(removeResult, CSErrorBase):
-                    Logger.get('VideoServ').warning("Error while deleting a booking of type %s after deleting an event: %s"%(booking.getType(), removeResult.getLogMessage() ))
+                if booking.getType() != "Vidyo":
+                    removeResult = booking._delete()
+                    if isinstance(removeResult, CSErrorBase):
+                        Logger.get('VideoServ').warning("Error while deleting a booking of type %s after deleting an event: %s"%(booking.getType(), removeResult.getLogMessage() ))
                 self._unindexBooking(booking)
             except Exception, e:

indico/htdocs/js/indico/Collaboration/Collaboration.js

@@ -1343 +1343 @@
 
     IndicoUI.Dialogs.Util.confirm($T("Remove booking"),
-            Html.div({style:{paddingTop:pixels(10), paddingBottom:pixels(10)}}, $T("Are you sure you want to remove that ") + booking.type + $T(" booking?")),
+            Html.div({style:{paddingTop:pixels(10), paddingBottom:pixels(10), width:pixels(400)}}, $T("Are you sure you want to remove that ") + booking.type + $T(" booking?"),Html.br(), Html.span({width:'100px'},$T("Please be aware that by deleting this ") + booking.type + $T(" booking, all bookings which are cloned from it will also be deleted as a result."))),
             confirmHandler);
 };