Skip to content
Browse files

Merge branch 'master' of github.com:sferik/rails_admin

  • Loading branch information...
2 parents f5e1124 + f447386 commit 7d29f2143eb65794c7dd9e1c16a424c77ebe88cc @bbenezech bbenezech committed
View
2 .travis.yml
@@ -25,3 +25,5 @@ matrix:
notifications:
irc: "irc.freenode.org#railsadmin"
script: spec/ci.sh
+services:
+ - mongodb
View
2 README.md
@@ -131,7 +131,7 @@ All configuration documentation has moved to the wiki: https://github.com/sferik
![Delete view](https://github.com/sferik/rails_admin/raw/master/screenshots/delete.png "delete view")
![List view](https://github.com/sferik/rails_admin/raw/master/screenshots/list.png "list view")
![Nested view](https://github.com/sferik/rails_admin/raw/master/screenshots/nested.png "nested view")
-![Polymophic edit view](https://github.com/sferik/rails_admin/raw/master/screenshots/polymorphic.png "polymorphic view")
+![Polymorphic edit view](https://github.com/sferik/rails_admin/raw/master/screenshots/polymorphic.png "polymorphic view")
## Support
View
2 app/views/rails_admin/main/_form_file_upload.html.haml
@@ -7,7 +7,7 @@
- if field.optional? && field.errors.blank? && file && field.delete_method
%a.btn.btn-info{:href => '#', :'data-toggle' => 'button', :onclick => "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false"}
%i.icon-white.icon-trash
- = I18n.t('admin.actions.delete.menu').capitalize + " #{field.method_name}"
+ = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase}"
= form.check_box(field.delete_method, :style => 'display:none;' )
- if field.cache_method
= form.hidden_field(field.cache_method)
View
2 lib/rails_admin/adapters/active_record.rb
@@ -4,7 +4,7 @@
module RailsAdmin
module Adapters
module ActiveRecord
- DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore]
+ DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore, :geometry]
DISABLED_COLUMN_MATCHERS = [/_array$/]
def ar_adapter
View
4 lib/rails_admin/version.rb
@@ -1,8 +1,8 @@
module RailsAdmin
class Version
MAJOR = 0 unless defined? MAJOR
- MINOR = 0 unless defined? MINOR
- PATCH = 5 unless defined? PATCH
+ MINOR = 1 unless defined? MINOR
+ PATCH = 0 unless defined? PATCH
PRE = nil unless defined? PRE
class << self
View
2 spec/dummy_app/app/mongoid/ball.rb
@@ -6,7 +6,7 @@ class Ball
attr_accessible :color
- validates_presence_of :color
+ validates_presence_of :color, :on => :create
def to_param
color.present? ? color.downcase.gsub(" ", "-") : id
View
4 spec/unit/config/fields/base_spec.rb
@@ -373,6 +373,10 @@ class FieldVisibilityTest < Tableless
end
describe '#editable?' do
+ before do
+ Moped.logger.stub!(:debug) if defined?(Moped)
+ end
+
it 'should yell for non attr_accessible fields if config.yell_for_non_accessible_fields is true' do
RailsAdmin.config do |config|
config.yell_for_non_accessible_fields = true

0 comments on commit 7d29f21

Please sign in to comment.
Something went wrong with that request. Please try again.