Changeset da9a8d in indico

Timestamp:

02/24/10 13:47:26 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

prov-dual-interface

Children:

254b0f

Parents:

d5810d (diff), ff2a50 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'v0.97-series' into prov-dual-interface

Location:

indico/MaKaC

Files:

• conference.py (modified) (1 diff)
• fileRepository.py (modified) (1 diff)
• webinterface/tpls/Header.tpl (modified) (1 diff)
• webinterface/tpls/InterfaceSwitcher.tpl (added)
• webinterface/tpls/RoomBookingRoomCalendar.tpl (modified) (3 diffs)
• webinterface/urlHandlers.py (modified) (1 diff)

indico/MaKaC/conference.py

@@ -11689 +11689 @@
         return self.description
 
-    def archive( self, repository=None ):
+    def archive( self, repository=None, forcedFileId=None ):
         """performs necessary operations to ensure the archiving of the
             resource. By default is doing nothing as the persistence of the

indico/MaKaC/fileRepository.py

@@ -161 +161 @@
         volume = minfo.getArchivingVolume()
         destPath = os.path.join( self.__getRepositoryPath(), volume, interPath, id )
-        os.makedirs( destPath )
+
+        if forcedFileId == None:
+            os.makedirs( destPath )
+
         destPath = os.path.join( destPath, newFile.getFileName() )
         relativePath = os.path.join( volume, interPath, id, newFile.getFileName())
-        try:
-            shutil.copyfile( newFile.getFilePath(), destPath )
-            self.__files[id] = relativePath
-            newFile.setArchivedId( self, id )
-        except IOError, e:
-            raise Exception( _("Couldn't archive file %s to %s")%( newFile.getFilePath(), destPath ) )
+
+        if forcedFileId == None:
+            try:
+                shutil.copyfile( newFile.getFilePath(), destPath )
+            except IOError, e:
+                raise Exception( _("Couldn't archive file %s to %s")%( newFile.getFilePath(), destPath ) )
+
+        self.__files[id] = relativePath
+        newFile.setArchivedId( self, id )
 
         Logger.get('storage').info("stored resource %s (%s) at %s" % (id, newFile.getFileName(), os.path.join(volume, interPath)))

indico/MaKaC/webinterface/tpls/Header.tpl

@@ -1 +1 @@
 <% declareTemplate(newTemplateStyle = True) %>
 
+<% includeTpl('InterfaceSwitcher') %>
 <% includeTpl('Announcement') %>
 

indico/MaKaC/webinterface/tpls/RoomBookingRoomCalendar.tpl

@@ -3 +3 @@
 Room Calendar is composed of day rows ( RoomBookingRoomCalendar*DayRow* )
 Day row is composed of of bars, showing particular reservations ( RoomBookingRoomCalendar*Bar* )
-Calendar 1-----* DayRow 1-----* Bar 
+Calendar 1-----* DayRow 1-----* Bar
 -->
 
@@ -12 +12 @@
     <p style="margin-left: 10px;">
         <% if thereAreConflicts: %>
-            <span style="color: Red; font-weight: bold;"><%= conflictsNumber %>  <%= _("conflict(s) with other bookings")%></span><br /><br />
+            <span style="color: Red; font-weight: bold;"><%= conflictsNumber %>&nbsp;<%= _("conflict(s) with other bookings")%></span><br /><br />
             <% includeTpl( 'RoomBookingConflicts' ) %>
         <% end %>
@@ -81 +81 @@
                         continue;
                     // Get parent position
-                    dayDiv = barDiv.parentNode 
-                    dayPos = findPos( dayDiv ) 
+                    dayDiv = barDiv.parentNode
+                    dayPos = findPos( dayDiv )
                     dayX = dayPos[0]
                     dayY = dayPos[1]

indico/MaKaC/webinterface/urlHandlers.py

@@ -4502 +4502 @@
     def getDisplayUH(cls, klazz, type=""):
         return cls.displayUHs.get("%s%s"%(klazz.__name__, type), None)
-
-# Testing helloworld
-class UHHelloWorld(URLHandler):
-    _relativeURL = "helloWorld.py"
-
-    @classmethod
-    def getURL( cls, name=None ):
-        url = cls._getURL()
-        if name != None:
-            url.addParam("name", name)
-        return url