Skip to content

Commit 14b05d9

Browse files
author
Nicolas Rodriguez
committed
Coding style
1 parent 9e1be92 commit 14b05d9

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

ajax-datatables-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# -*- encoding: utf-8 -*-
1+
# coding: utf-8
22
$:.push File.expand_path('../lib', __FILE__)
33
require 'ajax-datatables-rails/version'
44

lib/ajax-datatables-rails/base.rb

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ def datatable
2121
@datatable ||= Datatable::Datatable.new(self)
2222
end
2323

24-
# Must overrited methods
2524
def view_columns
2625
fail(NotImplemented, view_columns_error_text)
2726
end
2827

28+
def get_raw_records
29+
fail(NotImplemented, raw_records_error_text)
30+
end
31+
2932
def data
3033
fail(NotImplemented, data_error_text)
3134
end
@@ -34,10 +37,6 @@ def additional_datas
3437
{}
3538
end
3639

37-
def get_raw_records
38-
fail(NotImplemented, raw_records_error_text)
39-
end
40-
4140
def as_json(*)
4241
{
4342
recordsTotal: records_total_count,
@@ -51,6 +50,14 @@ def records
5150
end
5251

5352
# helper methods
53+
def connected_columns
54+
@connected_columns ||= begin
55+
view_columns.keys.map do |field_name|
56+
datatable.column_by(:data, field_name.to_s)
57+
end.compact
58+
end
59+
end
60+
5461
def searchable_columns
5562
@searchable_columns ||= begin
5663
connected_columns.select(&:searchable?)
@@ -63,14 +70,6 @@ def search_columns
6370
end
6471
end
6572

66-
def connected_columns
67-
@connected_columns ||= begin
68-
view_columns.keys.map do |field_name|
69-
datatable.column_by(:data, field_name.to_s)
70-
end.compact
71-
end
72-
end
73-
7473
private
7574

7675
def sanitize(data)

0 commit comments

Comments
 (0)