Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed naming issues with spine controller.

Browse source
This commit is contained in:
Martin Edenhofer 2015-11-02 16:39:56 +01:00
parent 45413b56b2
commit c8bb1d1d73
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/controllers/_application_controller_table.coffee
View file

@ -11,8 +11,6 @@ class App.ControllerTable extends App.Controller
constructor: (params) ->
super
for key, value of params
@[key] = value
# apply personal preferences
data = @preferencesGet()
@ -109,7 +107,7 @@ class App.ControllerTable extends App.Controller
new App.ControllerTable(
el: element
overview: ['time', 'area', 'level', 'browser', 'location', 'data']
attributes: [
attribute_list: [
{ name: 'time', display: 'Time', tag: 'datetime' },
{ name: 'area', display: 'Area', type: 'text' },
{ name: 'level', display: 'Level', type: 'text' },
@ -126,7 +124,7 @@ class App.ControllerTable extends App.Controller
if !@model
@model = {}
overview = @overview || @model.configure_overview || []
attributes = @attributes || @model.configure_attributes || {}
attributes = @attribute_list || @model.configure_attributes || {}
attributes = App.Model.attributesGet(false, attributes)
destroy = @model.configure_delete

2
public/assets/tests/table.js
View file

@ -546,7 +546,7 @@ test( "table test 4", function() {
new App.ControllerTable({
el: el,
overview: ['name', 'data', 'active'],
attributes: [
attribute_list: [
{ name: 'name', display: 'Name', type: 'text', style: 'width: 10%' },
{ name: 'data', display: 'Data', type: 'text' },
{ name: 'active', display: 'Active', type: 'text' },