From 738e82fb0bc82bc1208d4ec9947a554cd33e66c1 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 14 Apr 2012 11:49:59 +0200
Subject: [PATCH] unify create and edit forms; i18n fix: check session

---
 browser/form.py        |  3 +++
 browser/form_macros.pt | 27 ++++++++++++++-------------
 i18n/browser.py        |  4 ++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/browser/form.py b/browser/form.py
index ad73acf..ce3cd2e 100644
--- a/browser/form.py
+++ b/browser/form.py
@@ -149,6 +149,9 @@ class ObjectForm(NodeView):
 
     @Lazy
     def data(self):
+        return self.getData()
+
+    def getData(self):
         instance = self.instance
         data = instance.applyTemplate(mode='edit')
         form = self.request.form
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index f39b0a9..eeec0bd 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -71,18 +71,19 @@
 </form>
 
 
-<metal:block define-macro="create" i18n:domain="loops">
- <div dojoType="dijit.layout.BorderContainer"
+<form metal:define-macro="create" i18n:domain="loops"
+      method="post" enctype="multipart/form-data"
+      id="dialog_form" class="dialog"
+      dojoType="dijit.form.Form"
+      tal:define="qualifier request/qualifier|view/qualifier|string:resource;
+                  innerForm request/inner_form|view/inner_form|string:inner_form.html;
+                  typeToken view/typeToken;
+                  fixedType view/fixedType;
+                  langInfo view/languageInfo;
+                  language langInfo/language">
+  <div dojoType="dijit.layout.BorderContainer"
        style="width: 70em; height: 600px"
        tal:omit-tag="not:view/isInnerHtml">
-  <form method="post" enctype="multipart/form-data"
-        id="dialog_form" class="dialog"
-        tal:define="qualifier request/qualifier|view/qualifier|string:resource;
-                    innerForm request/inner_form|view/inner_form|string:inner_form.html;
-                    typeToken view/typeToken;
-                    fixedType view/fixedType;
-                    langInfo view/languageInfo;
-                    language langInfo/language">
     <div dojoType="dijit.layout.ContentPane" region="center"
          tal:omit-tag="not:view/isInnerHtml">
       <input type="hidden" name="form.action" value="create"
@@ -113,6 +114,7 @@
                      tal:condition="fixedType"
                      tal:attributes="value typeToken" />
               <script type="text/javascript"
+                      tal:condition="not:fixedType"
                       tal:content="string:replaceFieldsNode(
                                     'form.fields', 'form.type',
                                     '${view/virtualTargetUrl}/$innerForm')">
@@ -135,9 +137,8 @@
       </table>
     </div>
     <div metal:use-macro="view/template/macros/buttons" />
-  </form>
- </div>
-</metal:block>
+  </div>
+</form>
 
 
 <metal:assignments define-macro="assignments"
diff --git a/i18n/browser.py b/i18n/browser.py
index a064917..5a82329 100644
--- a/i18n/browser.py
+++ b/i18n/browser.py
@@ -62,6 +62,10 @@ class LanguageInfo(object):
         if len(available) == 1:
             return available[0]
         lang = self.request.get('loops.language')
+        if lang is not None and lang in available:
+            return lang
+        session = ISession(self.request)[packageId]
+        lang = session.get('language')
         if lang is not None and lang in available:
             return lang
         return (negotiator.getLanguage(available, self.request)