3 files changed, 24 insertions, 1 deletions
diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
new file mode 100644
index 000000000..cb4bf65b4
--- /dev/null
+++ b/config/initializers/active_record.rb
@@ -0,0 +1,2 @@
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key"
+
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
index 140d5aee2..7aee33df5 100644
--- a/config/initializers/formtastic.rb
+++ b/config/initializers/formtastic.rb
@@ -1 +1,21 @@
-  Formtastic::FormBuilder.i18n_lookups_by_default = true
-\ No newline at end of file
+  Formtastic::FormBuilder.i18n_lookups_by_default = true
+
+
+module Formtastic
+  module Inputs
+    class CheckBoxesInput
+      def selected_values
+        if object.respond_to?(method)
+          selected_items = [object.send(method)].compact.flatten
+
+          # FIX for ids only
+          return selected_items.map(&:to_s).compact if selected_items.all?{ |i| i.is_a? Integer} 
+
+          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
+        else
+          []
+        end
+      end
+    end
+  end
+end
diff --git a/config/initializers/postgresql_adapter_patch.rb b/config/initializers/postgresql_adapter_patch.rb
index 916933b39..42968bbdf 100644
--- a/config/initializers/postgresql_adapter_patch.rb
+++ b/config/initializers/postgresql_adapter_patch.rb
@@ -9,3 +9,4 @@ module ::ArJdbc
     end
   end
 end
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key"