From 3cdd73207898c531f6a3ff9695ed83d617fd8bdf Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Thu, 26 Jan 2017 22:50:30 +0200
Subject: [PATCH] flask-admin fixes (exclude created_at/updated_at so models
 can be saved)

---
 redash/admin.py  | 4 ++++
 redash/models.py | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/redash/admin.py b/redash/admin.py
index d58501abe3..f2a892e1ea 100644
--- a/redash/admin.py
+++ b/redash/admin.py
@@ -42,6 +42,7 @@ def process_formdata(self, valuelist):
 class BaseModelView(ModelView):
     column_display_pk = True
     model_form_converter = AdminModelConverter
+    form_excluded_columns = ('created_at', 'updated_at')
 
     @require_super_admin
     def is_accessible(self):
@@ -54,10 +55,13 @@ class QueryResultModelView(BaseModelView):
 
 class QueryModelView(BaseModelView):
     column_exclude_list = ('latest_query_data',)
+    form_excluded_columns = ('version', 'visualizations', 'alerts', 'org', 'created_at', 'updated_at', 'latest_query_data')
 
 
 class DashboardModelView(BaseModelView):
     column_searchable_list = ('name', 'slug')
+    column_exclude_list = ('version', )
+    form_excluded_columns = ('version', 'widgets', 'org', 'created_at', 'updated_at')
 
 
 def init_admin(app):
diff --git a/redash/models.py b/redash/models.py
index 62a72f151e..a387c9f6aa 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -236,6 +236,9 @@ class Organization(TimestampMixin, db.Model):
     def __repr__(self):
         return u"<Organization: {}, {}>".format(self.id, self.name)
 
+    def __unicode__(self):
+        return u'%s (%s)' % (self.name, self.id)
+
     @classmethod
     def get_by_slug(cls, slug):
         return cls.query.filter(cls.slug == slug).first()