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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Felix Niklas 2015-11-02 16:48:20 +01:00
commit 8bd1ce4748
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/controllers/_application_controller_form.coffee
View file

@ -1,5 +1,6 @@
class App.ControllerForm extends App.Controller class App.ControllerForm extends App.Controller
constructor: (params) -> constructor: (params) ->
super
for key, value of params for key, value of params
@[key] = value @[key] = value

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

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

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

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