From: Benoît Pin <benoit.pin@gmail.com>
Date: Wed, 9 Jul 2014 05:54:33 +0000 (+0200)
Subject: Formulaire http pleinement fonctionnel (reste à implémenter le changement de sens).
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/commitdiff_plain/88f9f2dde90223a13f97e2787e342b389457064e

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

diff --git a/skins/getPhotosInfos.py b/skins/getPhotosInfos.py
index 985528e..15a1713 100755
--- a/skins/getPhotosInfos.py
+++ b/skins/getPhotosInfos.py
@@ -69,4 +69,9 @@ for p in batch :
         }
     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 ad661d2..e6b6657 100644
--- 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') :
-    context.setDefaultSorting(fg('sorting'), False)
+    context.setDefaultSorting(fg('sort_on'), False)
     if not fg('ajax') :
         return context.setRedirect(context, 'object/view')
     else :
diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index 14bd91c..06de5c3 100644
--- 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>
-            <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"/>