Formulaire http pleinement fonctionnel (reste à implémenter le changement de sens).

diff --git a/skins/getPhotosInfos.py b/skins/getPhotosInfos.py
index 985528e901e68219e3e57a56eae93dee1474c2f3..15a17134fd66850ed788e925768d059d1535ebfb 100755 (executable)
--- a/skins/getPhotosInfos.py
+++ b/skins/getPhotosInfos.py
@@ -69,4 +69,9 @@ for p in batch :
         }
     infos.append(d)
 
         }
     infos.append(d)
 

-return {'infos':infos, 'batch':batch, 'features':features}
+return {'infos':infos,
+        'batch':batch,
+        'features':features,
+        'sorting' : {'sort_on' : sort_on,
+                     'sort_order' : sort_order}
+        }

diff --git a/skins/portfolio_edit_form.py b/skins/portfolio_edit_form.py
index ad661d29fe0ff343d38970950b46c52287f6d6ff..e6b6657b1118314f96019a156f62eda6bacf050c 100644 (file)
--- a/skins/portfolio_edit_form.py
+++ b/skins/portfolio_edit_form.py
@@ -28,7 +28,7 @@ if fg('delete.x') or form.has_key('delete') :
     else :
         return '<deleted>%s</deleted>' % msg
 if fg('set_sorting') :
     else :
         return '<deleted>%s</deleted>' % msg
 if fg('set_sorting') :

-    context.setDefaultSorting(fg('sorting'), False)
+    context.setDefaultSorting(fg('sort_on'), False)

     if not fg('ajax') :
         return context.setRedirect(context, 'object/view')
     else :
     if not fg('ajax') :
         return context.setRedirect(context, 'object/view')
     else :

diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index 14bd91c89a8e06620e1752c44bf1e9d6675a2fda..06de5c39de2140cdfee976b1ec0359ce3af8a630 100644 (file)
--- a/skins/portfolio_view.pt
+++ b/skins/portfolio_view.pt
@@ -72,10 +72,14 @@
              tal:condition="python:mtool.checkPermission(ModifyPortalContent, here)">
           <span>
             <span i18n:translate="" tal:omit-tag="">sorting:</span>
              tal:condition="python:mtool.checkPermission(ModifyPortalContent, here)">
           <span>
             <span i18n:translate="" tal:omit-tag="">sorting:</span>

-            <select name="sorting">
-              <option value="position" i18n:translate="">manual</option>
-              <option value="DateTimeOriginal" i18n:translate="">shooting</option>
-              <option value="modified" i18n:translate="">modification</option>
+            <select tal:define="sort_on batchInfos/sorting/sort_on"
+                    name="sort_on">
+              <option tal:attributes="selected python:sort_on=='position'"
+                      value="position" i18n:translate="">manual</option>
+              <option tal:attributes="selected python:sort_on=='DateTimeOriginal'"
+                      value="DateTimeOriginal" i18n:translate="">shooting</option>
+              <option tal:attributes="selected python:sort_on=='modified'"
+                      value="modified" i18n:translate="">modification</option>

             </select>
             <noscript>
               <input type="submit" name="set_sorting" value="ok"/>
             </select>
             <noscript>
               <input type="submit" name="set_sorting" value="ok"/>