Skip to content

Commit

Permalink
Adding url slug support for dashboard model
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Dec 4, 2015
1 parent 618e117 commit 2743b24
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
3 changes: 2 additions & 1 deletion panoramix/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class Dashboard(Model, AuditMixinNullable):
position_json = Column(Text)
description = Column(Text)
css = Column(Text)
slug = Column(String(255), unique=True)
slices = relationship(
'Slice', secondary=dashboard_slices, backref='dashboards')

Expand All @@ -141,7 +142,7 @@ def __repr__(self):

@property
def url(self):
return "/panoramix/dashboard/{}/".format(self.id)
return "/panoramix/dashboard/{}/".format(self.slug or self.id)

def dashboard_link(self):
return '<a href="{self.url}">{self.dashboard_title}</a>'.format(self=self)
Expand Down
26 changes: 17 additions & 9 deletions panoramix/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ class SliceModelView(PanoramixModelView, DeleteMixin):
class DashboardModelView(PanoramixModelView, DeleteMixin):
datamodel = SQLAInterface(models.Dashboard)
list_columns = ['dashboard_link', 'created_by', 'changed_by', 'changed_on']
edit_columns = ['dashboard_title', 'slices', 'position_json', 'css']
edit_columns = [
'dashboard_title', 'slug', 'slices', 'position_json', 'css']
add_columns = edit_columns
base_order = ('changed_on','desc')
description_columns = {
Expand All @@ -223,7 +224,13 @@ class DashboardModelView(PanoramixModelView, DeleteMixin):
"The css for individual dashboards can be altered here, or "
"in the dashboard view where changes are immediatly "
"visible"),
'slug': "To get a readable URL for your dashboard",
}
def pre_add(self, obj):
obj.slug = obj.slug.strip() or None

def pre_update(self, obj):
self.pre_add(obj)


appbuilder.add_view(
Expand Down Expand Up @@ -412,15 +419,16 @@ def testconn(self):
mimetype="application/json")

@has_access
@expose("/dashboard/<id_>/")
def dashboard(self, id_):
@expose("/dashboard/<identifier>/")
def dashboard(self, identifier):
session = db.session()
dashboard = (
session
.query(models.Dashboard)
.filter(models.Dashboard.id == id_)
.first()
)
qry = session.query(models.Dashboard)
if identifier.isdigit():
qry = qry.filter_by(id=int(identifier))
else:
qry = qry.filter_by(slug=identifier)

dashboard = qry.first()
pos_dict = {}
if dashboard.position_json:
pos_dict = {
Expand Down

0 comments on commit 2743b24

Please sign in to comment.