Fetch des photos ok sous FF.

[Portfolio.git] / skins / getPhotosInfos.py

diff --git a/skins/getPhotosInfos.py b/skins/getPhotosInfos.py
index 15a1713..c5b00a7 100755 (executable)
--- a/skins/getPhotosInfos.py
+++ b/skins/getPhotosInfos.py
@@ -1,4 +1,4 @@
-##parameters=portfolio
+##parameters=portfolio, pho_start=None, batch_size=None

 from Products.Plinn.PloneMisc import Batch
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.permissions import ReviewPortalContent, ModifyPortalContent
 from Products.Plinn.PloneMisc import Batch
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.permissions import ReviewPortalContent, ModifyPortalContent


@@ -9,12 +9,12 @@ uidtool = getToolByName(context, 'portal_uidhandler')
 features = {}
 def toggleSelection(o, selected) :
     if selected :
 features = {}
 def toggleSelection(o, selected) :
     if selected :

-        return '%s/remove_to_selection' % o.absolute_url()
+        return '%s/remove_to_selection' % o.getURL()

     else :
     else :

-        return '%s/add_to_selection' % o.absolute_url()
+        return '%s/add_to_selection' % o.getURL()

     
 features['select'] = toggleSelection
     
 features['select'] = toggleSelection

-features['cart'] = lambda o : '%s/get_slide_buyable_items' % o.absolute_url()
+features['cart'] = lambda o : '%s/get_slide_buyable_items' % o.getURL()

 
 if mtool.checkPermission(ReviewPortalContent, context) :
     features['hideAnonymous'] = True
 
 if mtool.checkPermission(ReviewPortalContent, context) :
     features['hideAnonymous'] = True


@@ -22,13 +22,14 @@ if mtool.checkPermission(ModifyPortalContent, context) :
     features['checkbox'] = True
 
 req = context.REQUEST
     features['checkbox'] = True
 
 req = context.REQUEST

-pho_start = req.get('pho_start', 0)
+pho_start = pho_start if pho_start is not None else 0
+batch_size = batch_size if batch_size is not None else context.default_batch_size

 sort_on, sort_order = context.getDefaultSorting()
 contentFilter = {'portal_type' : ['Photo'],
                  'sort_on' : sort_on,
                  'sort_order' : sort_order}
 batch = Batch(portfolio.listCatalogedContents(contentFilter=contentFilter),
 sort_on, sort_order = context.getDefaultSorting()
 contentFilter = {'portal_type' : ['Photo'],
                  'sort_on' : sort_on,
                  'sort_order' : sort_order}
 batch = Batch(portfolio.listCatalogedContents(contentFilter=contentFilter),

-              context.default_batch_size, pho_start, orphan=5, quantumleap=1, b_start_str='pho_start')
+              batch_size, pho_start, orphan=5, quantumleap=1, b_start_str='pho_start')

 
 
 infos = []
 
 
 infos = []


@@ -45,7 +46,7 @@ for p in batch :
     selected = selDict.has_key(uid)
     hiddenForAnonymous = p.hiddenForAnonymous
     if pptool :
     selected = selDict.has_key(uid)
     hiddenForAnonymous = p.hiddenForAnonymous
     if pptool :

-        buyable = bool(pptool.getPrintingOptionsFor(p))
+        buyable = bool(pptool.getPrintingOptionsFor(p.getObject()))

         if cart and cart.locked :
             buyable = False
     else :
         if cart and cart.locked :
             buyable = False
     else :