From 4c9f081367f5d0c8a63bbcc5a37f9d34c0b583ad Mon Sep 17 00:00:00 2001 From: Herbert Joseph Date: Sun, 15 Jan 2017 17:13:42 -0500 Subject: [PATCH 1/3] Fix to allow all view columns until 0.4.0 upgrade --- .idea/.rakeTasks | 7 + .idea/ajax-datatables-rails.iml | 9 ++ .idea/misc.xml | 14 ++ .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + .idea/workspace.xml | 227 ++++++++++++++++++++++++++++++ lib/ajax-datatables-rails/base.rb | 2 +- 7 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 .idea/.rakeTasks create mode 100644 .idea/ajax-datatables-rails.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks new file mode 100644 index 00000000..c6865d9a --- /dev/null +++ b/.idea/.rakeTasks @@ -0,0 +1,7 @@ + + diff --git a/.idea/ajax-datatables-rails.iml b/.idea/ajax-datatables-rails.iml new file mode 100644 index 00000000..caa1ec77 --- /dev/null +++ b/.idea/ajax-datatables-rails.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..a14f1a2b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..3e6a9f91 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..76c6196b --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1484518385072 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb index 080fe0c1..96149103 100644 --- a/lib/ajax-datatables-rails/base.rb +++ b/lib/ajax-datatables-rails/base.rb @@ -195,7 +195,7 @@ def sortable_displayed_columns def generate_sortable_displayed_columns @sortable_displayed_columns = [] params[:columns].each_value do |column| - @sortable_displayed_columns << column[:data] if column[:orderable] == 'true' + @sortable_displayed_columns << column[:data] # if column[:orderable] == 'true' end @sortable_displayed_columns end From 853aa60b6119820e43c3b2f857767a60024f5195 Mon Sep 17 00:00:00 2001 From: Herbert Joseph Date: Sun, 15 Jan 2017 17:18:36 -0500 Subject: [PATCH 2/3] ignore rubymine files --- .gitignore | 2 ++ .idea/workspace.xml | 75 +++++++++++++++++++++++++++++++++------------ 2 files changed, 58 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index d87d4be6..307fdb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ spec/reports test/tmp test/version_tmp tmp +.idea +.idea/* \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 76c6196b..a740f776 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ - + + @@ -21,7 +22,7 @@ - + @@ -32,16 +33,26 @@ - + - + + + + + + + + + + + @@ -51,6 +62,7 @@ @@ -61,9 +73,8 @@ DEFINITION_ORDER - @@ -90,6 +101,8 @@ + + @@ -142,13 +155,12 @@ - - + - - + - - - - + + + - - + + - + - + + @@ -217,11 +230,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From cd4a8de91d0d105dc922d76460f93105a8f7fcf9 Mon Sep 17 00:00:00 2001 From: Herbert Joseph Date: Sun, 15 Jan 2017 17:19:09 -0500 Subject: [PATCH 3/3] remove rubymine files --- .idea/.rakeTasks | 7 - .idea/ajax-datatables-rails.iml | 9 -- .idea/misc.xml | 14 -- .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 264 -------------------------------- 6 files changed, 308 deletions(-) delete mode 100644 .idea/.rakeTasks delete mode 100644 .idea/ajax-datatables-rails.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks deleted file mode 100644 index c6865d9a..00000000 --- a/.idea/.rakeTasks +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/.idea/ajax-datatables-rails.iml b/.idea/ajax-datatables-rails.iml deleted file mode 100644 index caa1ec77..00000000 --- a/.idea/ajax-datatables-rails.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index a14f1a2b..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3e6a9f91..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index a740f776..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1484518385072 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file