merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 10 Jun 2009 12:50:05 +0200
branchstable
changeset 2090 089d1705c89c
parent 2087 88fa02f50e71 (diff)
parent 2089 b1070848726b (current diff)
child 2091 a7ea618e5478
merge
--- a/web/formfields.py	Wed Jun 10 12:24:22 2009 +0200
+++ b/web/formfields.py	Wed Jun 10 12:50:05 2009 +0200
@@ -376,7 +376,7 @@
         return formatstr % float(value)
 
     def render_example(self, req):
-        return self.format_value(req, 1.234)
+        return self.format_single_value(req, 1.234)
 
 
 class DateField(StringField):
@@ -387,7 +387,7 @@
         return value and ustrftime(value, req.property_value(self.format_prop)) or u''
 
     def render_example(self, req):
-        return self.format_value(req, datetime.now())
+        return self.format_single_value(req, datetime.now())
 
 
 class DateTimeField(DateField):
@@ -395,7 +395,7 @@
 
 
 class TimeField(DateField):
-    format_prop = 'ui.datetime-format'
+    format_prop = 'ui.time-format'
     widget = TextInput
 
 
--- a/web/views/cwproperties.py	Wed Jun 10 12:24:22 2009 +0200
+++ b/web/views/cwproperties.py	Wed Jun 10 12:50:05 2009 +0200
@@ -19,7 +19,7 @@
 from cubicweb.web import uicfg, stdmsgs
 from cubicweb.web.form import FormViewMixIn
 from cubicweb.web.formfields import FIELDS, StringField
-from cubicweb.web.formwidgets import Select, Button, SubmitButton
+from cubicweb.web.formwidgets import Select, TextInput, Button, SubmitButton
 from cubicweb.web.views import primary, formrenderers
 
 
@@ -346,12 +346,13 @@
             else:
                 self.choices = vocab
             wdg = Select()
+        elif pdef['type'] == 'String': # else we'll get a TextArea by default
+            wdg = TextInput()
         else:
-            wdg = FIELDS[pdef['type']].widget()
+            field = FIELDS[pdef['type']]()
+            wdg = field.widget
             if pdef['type'] == 'Boolean':
-                self.choices = [(form.req._('yes'), '1'), (form.req._('no'), '')]
-            elif pdef['type'] in ('Float', 'Int'):
-                wdg.attrs.setdefault('size', 3)
+                self.choices = field.vocabulary(form)
         self.widget = wdg
 
 
--- a/web/webconfig.py	Wed Jun 10 12:24:22 2009 +0200
+++ b/web/webconfig.py	Wed Jun 10 12:50:05 2009 +0200
@@ -6,6 +6,7 @@
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
 __docformat__ = "restructuredtext en"
+_ = unicode
 
 import os
 from os.path import join, exists, split
@@ -16,7 +17,6 @@
 from cubicweb.toolsutils import read_config
 from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options, merge_options
 
-_ = unicode
 
 register_persistent_options( (
     # site-wide only web ui configuration