page body fixes

This commit is contained in:
2015-10-04 15:00:47 +02:00
parent db526f7b9b
commit cc785c4d73
6 changed files with 15 additions and 13 deletions
@@ -1,11 +1,11 @@
App.PageBodyComponent = Ember.Component.extend
setTemplate: (->
body = @get('templateBody')
body = @get('page.body')
body ||= ""
try
template = Ember.HTMLBars.compile(body)
catch
template = Ember.HTMLBars.compile(tspan('page.cannot_compile'))
@set 'template', Ember.HTMLBars.template(template)
@set 'layout', Ember.HTMLBars.template(template)
@rerender()
).on('init').observes('templateBody')
).on('init').observes('page.body')
@@ -14,8 +14,7 @@ App.Router.map ->
@resource 'list', path: ':list_id'
@route 'employees'
@route 'employee', path: '/employees/:employee_id'
@resource 'pages', ->
@resource 'page', path: ':page_id'
@route 'page', path: 'pages/:page_id'
@route 'orders_display' # chromecast etc
@route 'menu'
@route 'settings'
@@ -1,4 +1,4 @@
.row: .small-12.columns
h2.main-section-header=model.title
/= page-body model.body
= page-body templateBody=model.body
= page-body page=model
+3 -1
View File
@@ -2,5 +2,7 @@ class Suppliers::PageSerializer
include Qwaiter::SupplierBaseSerializer
attributes :title, :body, :locale, :position
attribute(:name) { object.name.to_s.sub /^suppliers-/, '' }
attribute(:id) { object.name.to_s.sub /^suppliers-/, '' }
def id
object.name.to_s.sub /^suppliers-/, ''
end
end