Delete bugs.

Author: Ivan Krivosheev

examples/sqla_utils/app.py

@@ -37,7 +37,7 @@ class User(db.Model):
     email = db.Column(db.String(120), unique=True)
     password = db.Column(PasswordType(schemes=['md5_crypt']))
     status = db.Column(ChoiceType(choices=USERS_TYPE), default="1")
-    create = db.Column(ArrowType, default=arrow.utcnow)
+    create = db.Column(ArrowType, default=arrow.now())
     color = db.Column(ColorType, nullable=True)
 
     # Required for administrative interface. For python 3 please use __str__ instead.

flask_admin_utils/fields.py

@@ -1,7 +1,22 @@
 from flask.ext.admin.model.form import converts
 from flask.ext.admin.contrib.sqla.form import AdminModelConverter as Converter
 
-from sqla_utils_types import arrow_type, password_type, choice_type, color_type
+try:
+    from sqla_utils_types import arrow_type
+except ImportError:
+    arrow_type = None
+try:
+    from sqla_utils_types import password_type
+except ImportError:
+    password_type = None
+try:
+    from sqla_utils_types import choice_type
+except ImportError:
+    choice_type = None
+try:
+    from sqla_utils_types import color_type
+except ImportError:
+    color_type = None
 
 
 class AdminModelConverter(Converter):

flask_admin_utils/sqla_utils/form.py

@@ -3,7 +3,11 @@
 
 from flask.ext.admin.model import typefmt
 
-# BASE_FORMATTERS = typefmt.BASE_FORMATTERS.update({
-#     Password: password_formatter,
-#     Color: colour_formatter,
-# })
+from sqlalchemy_utils import Password
+BASE_FORMATTERS = typefmt.BASE_FORMATTERS.update({Password: password_formatter})
+
+try:
+    from colour import Color
+    BASE_FORMATTERS = typefmt.BASE_FORMATTERS.update({Color: color_formatter})
+except ImportError:
+    pass

flask_admin_utils/sqla_utils/formatter.py

@@ -1,3 +1,18 @@
-from flask.ext.admin.form.fields import DateTimeField
+import datetime
+from dateutil import tz
+
+from flask.ext.admin.form.fields import DateTimeField as DTF
+
+
+class DateTimeField(DTF):
+
+    def process_formdata(self, valuelist):
+        if valuelist:
+            date_str = ' '.join(valuelist)
+            try:
+                self.data = datetime.datetime.strptime(date_str, self.format).replace(tzinfo=tz.tzutc())
+            except ValueError:
+                self.data = None
+                raise ValueError(self.gettext('Not a valid datetime value'))
 
 field = DateTimeField

flask_admin_utils/sqla_utils/sqla_utils_types/__init__.py

@@ -1,4 +1,27 @@
-from ...fields import ColorField
+from jinja2 import Markup
+from colour import Color
+from wtforms import StringField, widgets
+
+
+class ColorInput(widgets.Input):
+    input_type = 'color'
+
+
+class ColorField(StringField):
+    widget = ColorInput()
+
+    def process_formdata(self, valuelist):
+        if valuelist:
+            try:
+                self.data = Color(valuelist[0])
+            except ValueError:
+                self.data = None
+                raise ValueError(self.gettext('Not a valid color value'))
+
+
+def color_formatter(view, value):
+    return Markup('<div style="float: left; margin: 2px -px 0 0; width: 15px; height: 15px; background: {0}"></div><div style="float: right">{0}</div>'.format(value))
+
 
 field = ColorField
-formatter = None
+formatter = color_formatter

flask_admin_utils/sqla_utils/sqla_utils_types/arrow_type.py

@@ -1,5 +1,15 @@
 from wtforms import PasswordField
 
 
+def password_formatter(view, value):
+    """
+        Return "********" - if value is Password
+
+        :param value:
+            Value to check
+    """
+    return "*" * 8
+
+
 field = PasswordField
-formatter = None
+formatter = password_formatter

flask_admin_utils/sqla_utils/sqla_utils_types/color_type.py

@@ -1,6 +1,6 @@
 from form import AdminModelConverter
 
-from formatter import BASE_FORMATTERS
+from sqla_utils_types import BASE_FORMATTERS
 
 from flask.ext.admin.contrib.sqla import ModelView as View