From dcc7ba4535f882e1223efc2055a0c540a0047623 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 1 Feb 2013 09:07:28 +0100 Subject: [PATCH] Added destroy option. --- .../_application_controller_table.js.coffee | 2 ++ .../javascripts/app/models/overview.js.coffee | 1 + .../javascripts/app/models/text_module.js.coffee | 1 + .../javascripts/app/views/generic/table.jst.eco | 14 ++++++++------ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee index a5b685f7c..7c732416a 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee @@ -46,6 +46,7 @@ class App.ControllerTable extends App.Controller overview = data.overview || data.model.configure_overview || [] attributes = data.attributes || data.model.configure_attributes || {} header = data.header + destroy = data.model.configure_delete # check if table is empty if _.isEmpty(data.objects) @@ -117,6 +118,7 @@ class App.ControllerTable extends App.Controller checkbox: data.checkbox radio: data.radio groupBy: data.groupBy + destroy: destroy ) # convert to jquery object diff --git a/app/assets/javascripts/app/models/overview.js.coffee b/app/assets/javascripts/app/models/overview.js.coffee index efe86641e..603f8ea76 100644 --- a/app/assets/javascripts/app/models/overview.js.coffee +++ b/app/assets/javascripts/app/models/overview.js.coffee @@ -91,6 +91,7 @@ class App.Overview extends Spine.Model { name: 'updated_at', display: 'Updated', type: 'time', readonly: 1 }, { name: 'active', display: 'Active', tag: 'boolean', note: 'boolean', 'default': true, 'null': false, 'class': 'span4' }, ] + @configure_delete = true @configure_overview = [ 'name', 'link', diff --git a/app/assets/javascripts/app/models/text_module.js.coffee b/app/assets/javascripts/app/models/text_module.js.coffee index 1860ef843..38a0d6b39 100644 --- a/app/assets/javascripts/app/models/text_module.js.coffee +++ b/app/assets/javascripts/app/models/text_module.js.coffee @@ -9,6 +9,7 @@ class App.TextModule extends App.Model { name: 'updated_at', display: 'Updated', type: 'time', readonly: 1 }, { name: 'active', display: 'Active', tag: 'boolean', note: 'boolean', 'default': true, 'null': false, 'class': 'span4' }, ] + @configure_delete = true @configure_overview = [ 'name', 'keywords', diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index 38ac94b5c..11913fa4a 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -10,9 +10,9 @@ <% for row in @header: %> style="<%= row.style %>"<% end %>><%- @T( row.display ) %> <% end %> - +<% if @destroy: %> + <%- @T('Destory') %> +<% end %> @@ -54,10 +54,12 @@ <% end %> +<% if @destroy: %> + + x + +<% end %> <% end %>