RubyGems - rails_admin - Versions diffs - 0.6.7 → 0.6.8 - Mend

rails_admin 0.6.7 → 0.6.8

Potentially problematic release.

This version of rails_admin might be problematic. Click here for more details.

Files changed (46) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e83f0b5ab7fea00e279ccb63773df754a184035
-  data.tar.gz: 03a9fae5679bf0d672d117ffd972e70a78428cb8
+  metadata.gz: e0409337248747730f7ea1bfeecd3c8a87970b95
+  data.tar.gz: a9a8e2ec8886981cdde444441df74ceaa5099e85
 SHA512:
-  metadata.gz: 4a25b6d1b31de086846abc6069af7190770fe71f2a8ce127282267776ace5206462abbfbddd1b12e839d224548fa8c12c6c4a1e2b9d7c1f7b8def9736146e6b3
-  data.tar.gz: f01215ec461ec23ea67a46455c610caa40c8c35168b160454a1c33c2534800126533c509bc7bfd8d2c9c2401923a679efa51ab046200b10ca83f41fac93c2608
+  metadata.gz: 65f95de98ec19d04476bf20a64c6d930c35d76e99c5499a939bb78e2207d277effb01807f63d2e6cffa301c0a79ef6f9ddd5cfc48a18f4fbe8f0470ed69c88f4
+  data.tar.gz: ce24bd3ce10b5952c29ba58e0c25284bddb54abd0493328298750aa29c20c1ad878be3d2797ef2d462411b422c83e4f39cb1fb8876543540e26031367a803a96

data/Gemfile CHANGED Viewed

@@ -68,7 +68,7 @@ group :test do
   gem 'poltergeist', '~> 1.5'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
-  gem 'rubocop', '>= 0.25'
+  gem 'rubocop', '~> 0.31.0'
   gem 'simplecov', '>= 0.9', require: false
   gem 'timecop', '>= 0.5'
 end

data/app/assets/javascripts/rails_admin/ra.datetimepicker.js CHANGED Viewed

@@ -26,11 +26,19 @@
       this.element.hide();
       if (this.options.showTime) {
+        var $wrap = $('<div class="input-group"/>');
         this.timepicker = $('<input class="TIMEPICKER" type="text" value="' + this.options.timepicker.value + '" />');
-        this.timepicker.css("width", "60px");
+        this.timepicker.css("width", "65px");
+        this.timepicker.addClass('form-control');
+        $wrap.append(this.timepicker);
+        $wrap.append($('<div class="input-group-addon"><i class="icon-time"></i></div>'));
-        this.timepicker.insertAfter(this.element);
+        $wrap.insertAfter(this.element);
         this.timepicker.bind("change", function() { widget._onChange(); });
@@ -38,11 +46,19 @@
       }
       if (this.options.showDate) {
+        var $wrap = $('<div class="input-group"/>');
         this.datepicker = $('<input type="text" value="' + this.options.datepicker.value + '" />');
-        this.datepicker.css("margin-right", "10px");
+        this.datepicker.addClass('form-control');
+        $wrap.css("margin-right", "15px");
+        $wrap.append(this.datepicker);
+        $wrap.append($('<div class="input-group-addon"><i class="icon-calendar"></i></div>'));
-        this.datepicker.insertAfter(this.element);
+        $wrap.insertAfter(this.element);
         this.datepicker.bind("change", function() { widget._onChange(); });

data/app/assets/javascripts/rails_admin/ra.filter-box.js CHANGED Viewed

@@ -16,7 +16,7 @@
       var operator_name = 'f[' +  field_name + '][' + index + '][o]';
       switch(field_type) {
         case 'boolean':
-          var control = '<select class="input-small" name="' + value_name + '">' +
+          var control = '<select class="input-sm form-control" name="' + value_name + '">' +
             '<option value="_discard">...</option>' +
             '<option value="true"' + (field_value == "true" ? 'selected="selected"' : '') + '>' + RailsAdmin.I18n.t("true") + '</option>' +
             '<option value="false"' + (field_value == "false" ? 'selected="selected"' : '') + '>' + RailsAdmin.I18n.t("false") + '</option>' +
@@ -28,7 +28,7 @@
         case 'date':
         case 'datetime':
         case 'timestamp':
-          var control = '<select class="switch-additionnal-fieldsets input-small" name="' + operator_name + '">' +
+          var control = '<select class="switch-additionnal-fieldsets input-sm form-control" name="' + operator_name + '">' +
             '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("date") + '</option>' +
             '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("between_and_") + '</option>' +
             '<option ' + (field_operator == "today"   ? 'selected="selected"' : '') + ' value="today">' + RailsAdmin.I18n.t("today") + '</option>' +
@@ -40,20 +40,20 @@
             '<option ' + (field_operator == "_null"     ? 'selected="selected"' : '') + ' value="_null" >' + RailsAdmin.I18n.t("is_blank") + '</option>' +
           '</select>'
           var additional_control =
-          '<input class="date additional-fieldset default input-small" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
-          '<input placeholder="-∞" class="date additional-fieldset between input-small" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
-          '<input placeholder="∞" class="date additional-fieldset between input-small" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
+          '<input class="date additional-fieldset default input-sm form-control" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
+          '<input placeholder="-∞" class="date additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
+          '<input placeholder="∞" class="date additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
           break;
         case 'enum':
           var multiple_values = ((field_value instanceof Array) ? true : false)
-          var control = '<select style="display:' + (multiple_values ? 'none' : 'inline-block') + '" ' + (multiple_values ? '' : 'name="' + value_name + '"') + ' data-name="' + value_name + '" class="select-single input-small">' +
+          var control = '<select style="display:' + (multiple_values ? 'none' : 'inline-block') + '" ' + (multiple_values ? '' : 'name="' + value_name + '"') + ' data-name="' + value_name + '" class="select-single input-sm form-control">' +
               '<option value="_discard">...</option>' +
               '<option ' + (field_value == "_present" ? 'selected="selected"' : '') + ' value="_present">' + RailsAdmin.I18n.t("is_present") + '</option>' +
               '<option ' + (field_value == "_blank"   ? 'selected="selected"' : '') + ' value="_blank">' + RailsAdmin.I18n.t("is_blank") + '</option>' +
               '<option disabled="disabled">---------</option>' +
               field_options +
             '</select>' +
-            '<select multiple="multiple" style="display:' + (multiple_values ? 'inline-block' : 'none') + '" ' + (multiple_values ? 'name="' + value_name + '[]"' : '') + ' data-name="' + value_name + '[]" class="select-multiple input-small">' +
+            '<select multiple="multiple" style="display:' + (multiple_values ? 'inline-block' : 'none') + '" ' + (multiple_values ? 'name="' + value_name + '[]"' : '') + ' data-name="' + value_name + '[]" class="select-multiple input-sm form-control">' +
               field_options +
             '</select> ' +
             '<a href="#" class="switch-select"><i class="icon-' + (multiple_values ? 'minus' : 'plus') + '"></i></a>';
@@ -61,7 +61,7 @@
         case 'string':
         case 'text':
         case 'belongs_to_association':
-          var control = '<select class="switch-additionnal-fieldsets input-small" value="' + field_operator + '" name="' + operator_name + '">' +
+          var control = '<select class="switch-additionnal-fieldsets input-sm form-control" value="' + field_operator + '" name="' + operator_name + '">' +
             '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "like"        ? 'selected="selected"' : '') + ' value="like">' + RailsAdmin.I18n.t("contains") + '</option>' +
             '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "is"          ? 'selected="selected"' : '') + ' value="is">' + RailsAdmin.I18n.t("is_exactly") + '</option>' +
             '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "starts_with" ? 'selected="selected"' : '') + ' value="starts_with">' + RailsAdmin.I18n.t("starts_with") + '</option>' +
@@ -70,12 +70,12 @@
             '<option ' + (field_operator == "_not_null"    ? 'selected="selected"' : '') + ' value="_not_null">' + RailsAdmin.I18n.t("is_present") + '</option>' +
             '<option ' + (field_operator == "_null"      ? 'selected="selected"' : '') + ' value="_null">' + RailsAdmin.I18n.t("is_blank") + '</option>' +
           '</select>'
-          var additional_control = '<input class="additional-fieldset input-small" style="display:' + (field_operator == "_blank" || field_operator == "_present" ? 'none' : 'inline-block') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
+          var additional_control = '<input class="additional-fieldset input-sm form-control" style="display:' + (field_operator == "_blank" || field_operator == "_present" ? 'none' : 'inline-block') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
           break;
         case 'integer':
         case 'decimal':
         case 'float':
-          var control = '<select class="switch-additionnal-fieldsets input-small" name="' + operator_name + '">' +
+          var control = '<select class="switch-additionnal-fieldsets input-sm form-control" name="' + operator_name + '">' +
             '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("number") + '</option>' +
             '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("between_and_") + '</option>' +
             '<option disabled="disabled">---------</option>' +
@@ -83,12 +83,12 @@
             '<option ' + (field_operator == "_null"     ? 'selected="selected"' : '') + ' value="_null" >' + RailsAdmin.I18n.t("is_blank") + '</option>' +
           '</select>'
           var additional_control =
-          '<input class="additional-fieldset default input-small" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
-          '<input placeholder="-∞" class="additional-fieldset between input-small" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
-          '<input placeholder="∞" class="additional-fieldset between input-small" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
+          '<input class="additional-fieldset default input-sm form-control" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
+          '<input placeholder="-∞" class="additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
+          '<input placeholder="∞" class="additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
           break;
         default:
-          var control = '<input type="text" class="input-small" name="' + value_name + '" value="' + field_value + '"/> ';
+          var control = '<input type="text" class="input-sm form-control" name="' + value_name + '" value="' + field_value + '"/> ';
           break;
       }

data/app/assets/javascripts/rails_admin/ra.widgets.coffee CHANGED Viewed

@@ -217,3 +217,77 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
           goBootstrapWysihtml5s(@array, config_options)
       else
         goBootstrapWysihtml5s(@array, config_options)
+    # froala_wysiwyg
+    goFroalaWysiwygs = (array) =>
+      array.each ->
+        options = $(@).data('options')
+        config_options = $.parseJSON(options['config_options'])
+        if config_options
+          if !config_options['inlineMode']
+            config_options['inlineMode'] = false
+        else
+          config_options = { inlineMode: false }
+        uploadEnabled =
+        if config_options['imageUploadURL']
+          config_options['imageUploadParams'] =
+            authenticity_token: $('meta[name=csrf-token]').attr('content')
+        $(@).addClass('froala-wysiwyged')
+        $(@).editable(config_options)
+        if uploadEnabled
+          $(@).on 'editable.imageError', (e, editor, error) ->
+            alert("error uploading image: " + error.message);
+            # Custom error message returned from the server.
+            if error.code == 0
+            # Bad link.
+            else if error.code == 1
+            # No link in upload response.
+            else if error.code == 2
+            # Error during image upload.
+            else if error.code == 3
+            # Parsing response failed.
+            else if error.code == 4
+            # Image too large.
+            else if error.code == 5
+            # Invalid image type.
+            else if error.code == 6
+            # Image can be uploaded only to same domain in IE 8 and IE 9.
+            else if error.code == 7
+            else
+            return
+          .on('editable.afterRemoveImage', (e, editor, $img) ->
+            # Set the image source to the image delete params.
+            editor.options.imageDeleteParams =
+              src: $img.attr('src')
+              authenticity_token: $('meta[name=csrf-token]').attr('content')
+            # Make the delete request.
+            editor.deleteImage $img
+            return
+          ).on('editable.imageDeleteSuccess', (e, editor, data) ->
+            # handle success
+          ).on 'editable.imageDeleteError', (e, editor, error) ->
+            # handle error
+            alert("error deleting image: " + error.message);
+    array = content.find('[data-richtext=froala-wysiwyg]').not('.froala-wysiwyged')
+    if array.length
+      options = $(array[0]).data('options')
+      if not $.isFunction($.fn.editable)
+        $('head').append('<link href="' + options['csspath'] + '" rel="stylesheet" media="all" type="text\/css">')
+        $.getScript options['jspath'], (script, textStatus, jqXHR) =>
+          goFroalaWysiwygs(array)
+      else
+        goFroalaWysiwygs(array)

data/app/assets/javascripts/rails_admin/ui.coffee CHANGED Viewed

@@ -69,6 +69,11 @@ $(document).on 'rails_admin.dom_ready', ->
   $(".table").tooltip selector: "th[rel=tooltip]"
+  # Workaround for jquery-ujs formnovalidate issue:
+  # https://github.com/rails/jquery-ujs/issues/316
+  $('[formnovalidate]').on 'click', ->
+    $(this).closest('form').attr('novalidate', true)
 $(document).on 'click', '#fields_to_export label input#check_all', () ->
   elems = $('#fields_to_export label input')
   if $('#fields_to_export label input#check_all').is ':checked'

data/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss CHANGED Viewed

@@ -89,7 +89,7 @@
 	box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
 }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4F4F4F; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #9D9D9D; font-weight: normal; color: #313131; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { background-color: #b3e2f0; font-weight: normal; color: #313131; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #313131; text-decoration: none; }
 .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {
 	outline: none;

data/app/assets/stylesheets/rails_admin/base/theming.scss CHANGED Viewed

@@ -10,11 +10,7 @@ body.rails_admin {
   }
   /* room for upper navbar */
-  padding-top: 43px;
-  .reset-left {
-    padding-left: 0px;
-  }
+  padding-top: $navbar-height;
   /* Application name */
   .navbar .brand {
@@ -26,14 +22,32 @@ body.rails_admin {
   }
   .sidebar-nav {
-    padding: 9px 9px 9px 9px;
-    position: fixed;
-    width: 14%;
-    overflow-y: scroll;
-    top: 50px;
-    bottom: 0;
-    background: #eaf0f1;
-    z-index: 100;
+    padding: 0;
+    background-color: $navbar-default-bg;
+    .dropdown-header {
+      padding: ($grid-gutter-width / 2) ($grid-gutter-width / 2) 3px;
+      font-weight: bold;
+      color: $gray;
+      text-transform: uppercase;
+    }
+    > .nav-stacked > li > a {
+      padding: $padding-base-vertical ($grid-gutter-width / 2);
+      border-radius: 0;
+      &.nav-level-1 {
+        padding-left: $grid-gutter-width;
+      }
+      &.nav-level-2 {
+        padding-left: ($grid-gutter-width * 1.5);
+      }
+      &.nav-level-3 {
+        padding-left: ($grid-gutter-width * 2);
+      }
+    }
   }
   /* fat labels in forms */
@@ -56,14 +70,14 @@ body.rails_admin {
     }
     &.denser {
+      margin-top: 30px;
       .controls .nav {
-        margin-bottom:5px;
+        margin: 30px 0 0;
       }
       .remove_nested_fields,
       .remove_nested_one_fields {
         position:absolute;
       }
-      margin:0px;
       p {
         font-size: 12px;
         line-height: 16px;
@@ -77,15 +91,8 @@ body.rails_admin {
           margin-bottom: 0px;
         }
       }
-      .control-group {
-        margin: 0px;
-        padding-top:15px;
-      }
-      .control-label {
-        // width:145px;
-      }
       legend {
-        margin-bottom:0px;
+        margin-bottom: 30px;
       }
     }
@@ -100,74 +107,72 @@ body.rails_admin {
       display:block;
     }
+    /* Put form controls above siblings to make them accessible */
+    .controls {
+      z-index: 1;
+    }
     /* nested forms */
-    .tab-content .tab-pane {
-      &>.remove_nested_fields,
-      &>.remove_nested_one_fields {
-        display:none;
-      }
-      &:hover>.remove_nested_fields,
-      &:hover>.remove_nested_one_fields,
-      &>.remove_nested_one_fields.active {
-        display:block;
-      }
+    .tab-content {
+      .tab-pane {
+        @include clearfix;
+        border-left: 5px solid #049cdb;
+        position: relative;
-      border-left:5px solid #049cdb;
-      padding-left:5px;
-      fieldset {
-        margin-left:-10px;
-        .control-group > label {
+        fieldset {
+          padding-top: 30px;
         }
-        legend {
-          float:left;
-          margin-left:10px;
+        .form-group {
+          margin-right: 0;
+          margin-left: -5px; /* Balance border-left */
+        }
+        & > .remove_nested_fields,
+        & > .remove_nested_one_fields {
+          display:block;
+          opacity: 0;
+          position: absolute;
+          top: 0px;
+          left: 5px;
+          -webkit-transition: opacity .15s ease;
+          transition: opacity .15s ease;
+        }
+        &:hover > .remove_nested_fields,
+        &:hover > .remove_nested_one_fields,
+        & > .remove_nested_one_fields.active {
+          opacity: 1;
         }
       }
     }
     /* double nesting, guys. Easy. */
     .tab-content .tab-content .tab-pane {
-      border-color:lighten(#049cdb, 20%);
-      margin-left:10px;
-      fieldset {
-        margin-left:-20px;
-        .control-group > label {
-        }
-        legend {
-          margin-left:20px;
-        }
+      border-color: lighten(#049cdb, 20%);
+      margin-left: 10px;
+      .form-group {
+        margin-left: -15px; /* Balance border-left */
       }
     }
     /* triple nesting!*/
     .tab-content .tab-content .tab-content .tab-pane {
       border-color:lighten(#049cdb, 30%);
-      margin-left:20px;
-      fieldset {
-        margin-left:-30px;
-        .control-group > label {
-          padding-left:30px;
-          width:115px;
-        }
-        legend {
-          margin-left:30px;
-        }
+      margin-left: 20px;
+      .form-group {
+        margin-left: -25px; /* Balance border-left */
       }
     }
     /* totally awesome! nesting on 4 levels! */
     .tab-content .tab-content .tab-content  .tab-content .tab-pane {
       border-color:lighten(#049cdb, 40%);
-      margin-left:30px;
-      fieldset {
-        margin-left:-40px;
-        .control-group > label {
-          padding-left:40px;
-          width:105px;
-        }
-        legend {
-          margin-left:40px;
-        }
+      margin-left: 30px;
+      .form-group {
+        margin-left: -35px; /* Balance border-left */
       }
     }
   }
@@ -191,8 +196,12 @@ body.rails_admin {
   }
   /* tab links should match icon color */
-  .nav.nav-tabs li.icon a {
-    color: #000;
+  .nav.nav-tabs {
+    margin-bottom: 20px;
+    li.icon a {
+      color: #000;
+    }
   }
   /* Table cells behaviour */
@@ -290,3 +299,14 @@ body.rails_admin {
     }
   }
 }
+@media screen and (min-width: $screen-sm-min) {
+  body.rails_admin {
+    .sidebar-nav {
+      position: fixed;
+      top: $navbar-height;
+      bottom: 0;
+      overflow-y: scroll;
+    }
+  }
+}

data/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss CHANGED Viewed

@@ -33,12 +33,13 @@
 .ui-timepicker-table td a {
     width: auto;
 }
-.input-group {
-  .hasTimepicker {
-    @extend .form-control;
-    width: 65px !important;
-  }
-  .hasDatepicker {
-    @extend .form-control
-  }
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+  background-color: transparent;
+  cursor: pointer;
 }

data/app/assets/stylesheets/rails_admin/rails_admin.scss.erb CHANGED Viewed

@@ -90,6 +90,7 @@
 @import "rails_admin/bootstrap/popovers";
 @import "rails_admin/bootstrap/thumbnails";
 @import "rails_admin/bootstrap/labels";
+@import "rails_admin/bootstrap/panels";
 @import "rails_admin/bootstrap/badges";
 @import "rails_admin/bootstrap/progress-bars";
 <%# @import "rails_admin/bootstrap/accordion"; %>

data/app/controllers/rails_admin/application_controller.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module RailsAdmin
   class ActionNotAllowed < ::StandardError
   end
-  class ApplicationController < ::ApplicationController
+  class ApplicationController < Config.parent_controller.constantize
     newrelic_ignore if defined?(NewRelic)
     before_filter :_authenticate!
@@ -58,7 +58,9 @@ module RailsAdmin
       instance_eval(&RailsAdmin::Config.audit_with)
     end
-    alias_method :user_for_paper_trail, :_current_user
+    def user_for_paper_trail
+      _current_user.try(:id) || _current_user
+    end
     rescue_from RailsAdmin::ObjectNotFound do
       flash[:error] = I18n.t('admin.flash.object_not_found', model: @model_name, id: params[:id])

data/app/controllers/rails_admin/main_controller.rb CHANGED Viewed

@@ -115,7 +115,7 @@ module RailsAdmin
     def check_for_cancel
       return unless params[:_continue] || (params[:bulk_action] && !params[:bulk_ids])
-      redirect_to(back_or_index, flash: {info: t('admin.flash.noaction')})
+      redirect_to(back_or_index, notice: t('admin.flash.noaction'))
     end
     def get_collection(model_config, scope, pagination)

data/app/helpers/rails_admin/application_helper.rb CHANGED Viewed

@@ -32,6 +32,7 @@ module RailsAdmin
     end
     def edit_user_link
+      return nil unless _current_user.respond_to?(:email)
       return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
       return nil unless (edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)).try(:authorized?)
       link_to _current_user.email, url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main')
@@ -94,7 +95,7 @@ module RailsAdmin
         url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
-        li = content_tag :li, 'data-model' => model_param do
+        li = content_tag :li, data: {model: model_param} do
           link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
         li + navigation(nodes_stack, nodes_stack.select { |n| n.parent.to_s == node.abstract_model.model_name }, level + 1)
@@ -150,7 +151,7 @@ module RailsAdmin
       actions = actions(:bulkable, abstract_model)
       return '' if actions.empty?
       content_tag :li, class: 'dropdown', style: 'float:right' do
-        content_tag(:a, class: 'dropdown-toggle', :'data-toggle' => 'dropdown', href: '#') { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
+        content_tag(:a, class: 'dropdown-toggle', data: {toggle: 'dropdown'}, href: '#') { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
           content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
             actions.collect do |action|
               content_tag :li do
@@ -160,5 +161,14 @@ module RailsAdmin
           end
       end.html_safe
     end
+    def flash_alert_class(flash_key)
+      case flash_key.to_s
+      when 'error'  then 'alert-danger'
+      when 'alert'  then 'alert-warning'
+      when 'notice' then 'alert-info'
+      else "alert-#{flash_key}"
+      end
+    end
   end
 end

data/app/helpers/rails_admin/form_builder.rb CHANGED Viewed

@@ -63,11 +63,7 @@ module RailsAdmin
     end
     def field_for(field)
-      if field.read_only?
-        field.pretty_value.to_s.html_safe
-      else
-        field.render
-      end
+      field.read_only? ? @template.content_tag(:div, field.pretty_value, class: 'form-control-static') : field.render
     end
     def object_infos

data/app/views/layouts/rails_admin/_sidebar_navigation.html.haml ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ %ul.nav.nav-pills.nav-stacked= main_navigation
2	+ %ul.nav.nav-pills.nav-stacked= static_navigation

data/app/views/layouts/rails_admin/application.html.haml CHANGED Viewed

@@ -16,10 +16,7 @@
       = render "layouts/rails_admin/navigation"
     .container-fluid
       .row
-        .col-sm-3.col-md-2.reset-left
-          .sidebar-nav
-            %ul.nav.nav-pills.nav-stacked= main_navigation
-            %ul.nav.nav-pills.nav-stacked= static_navigation
+        .col-sm-3.col-md-2.sidebar-nav
+          = render "layouts/rails_admin/sidebar_navigation"
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
-          .row
-            .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
+          .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'

data/app/views/layouts/rails_admin/pjax.html.haml CHANGED Viewed

@@ -6,8 +6,7 @@
 .page-header
   %h1= @page_name
 - flash && flash.each do |key, value|
-  - key = 'danger' if key.to_s == 'error'
-  .alert{class: "alert-#{key}"}
+  .alert{class: flash_alert_class(key)}
     %a.close{href: '#', :'data-dismiss' => "alert"} &times;
     = value
 = breadcrumb

data/app/views/rails_admin/main/_form_boolean.html.haml ADDED Viewed

@@ -0,0 +1,3 @@
+.checkbox
+  %label{ style: 'display: block;' }
+    = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), required: field.required})

data/app/views/rails_admin/main/_form_datetime.html.haml CHANGED Viewed

@@ -1,2 +1,2 @@
-.input-group
-  = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value }).reverse_merge({ data: { datetimepicker: true, options: field.js_plugin_options.to_json } })
+.form-inline
+  = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, data: { datetimepicker: true, options: field.js_plugin_options.to_json } })

data/app/views/rails_admin/main/_form_field.html.haml CHANGED Viewed

	@@ -1 +1 @@
1	- = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, ~~checked: field.form_value.in?([true, '1']),~~ class: 'form-control', required: field.required})
1	+ = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, class: 'form-control', required: field.required})

data/app/views/rails_admin/main/_form_froala.html.haml ADDED Viewed

@@ -0,0 +1,8 @@
+:ruby
+  js_data = {
+    csspath: field.css_location,
+    jspath: field.js_location,
+    config_options: field.config_options.to_json
+  }
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: 'froala-wysiwyg', options: js_data.to_json }).reverse_merge({ value: field.form_value })

data/app/views/rails_admin/main/_form_nested_many.html.haml CHANGED Viewed

@@ -1,4 +1,4 @@
-.controls.col-md-offset-2{data: { nestedmany: true }}
+.controls.col-sm-10{data: { nestedmany: true }}
   .btn-group
     %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", class: (field.active? ? 'active' : '')}
       %i.icon-white
@@ -6,7 +6,8 @@
       = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { class: 'btn btn-info' }
   = form.errors_for(field)
   = form.help_for(field)
-  %ul.nav.nav-tabs{ style: 'margin-top:5px' }
+  %ul.nav.nav-tabs
 .tab-content
   = form.fields_for field.name do |nested_form|
     - if field.nested_form[:allow_destroy] || nested_form.options[:child_index] == "new_#{field.name}"

data/app/views/rails_admin/main/_form_nested_one.html.haml CHANGED Viewed

@@ -1,4 +1,4 @@
-.controls{data: { nestedone: true }}
+.controls.col-sm-10{data: { nestedone: true }}
   %ul.nav{style: 'margin-bottom:0px; display:none'}
   .btn-group
     %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content", class: (field.active? ? 'active' : '') }

data/app/views/rails_admin/main/_form_polymorphic_association.html.haml CHANGED Viewed

@@ -6,5 +6,6 @@
   selected = field.bindings[:object].send(field.association.name)
   column_type_dom_id = form.dom_id(field).sub(field.method_name.to_s, type_column)
-= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }
-= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, style: "margin-left:10px;"
+.form-inline
+  = form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-control", id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }
+  = form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, class: "form-control"

data/app/views/rails_admin/main/_submit_buttons.html.haml CHANGED Viewed

@@ -1,8 +1,6 @@
-%input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
-%br
 .form-group.form-actions
   .col-sm-offset-2.col-sm-10
+    %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
     %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
       %i.icon-white.icon-ok
       = t("admin.form.save")
@@ -13,6 +11,6 @@
       - if authorized? :edit, @abstract_model
         %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
           = t("admin.form.save_and_edit")
-      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
+      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel"), :formnovalidate => true}
         %i.icon-remove
         = t("admin.form.cancel")

data/app/views/rails_admin/main/dashboard.html.haml CHANGED Viewed

@@ -12,7 +12,7 @@
           - index_path = index_path(model_name: abstract_model.to_param)
           - row_class = "#{cycle("odd", "even")}#{" link" if index_path} #{abstract_model.param_key}_links"
           %tr{class: row_class, :"data-link" => index_path}
-            - last_used = @most_recent_changes[abstract_model.pretty_name]
+            - last_used = @most_recent_changes[abstract_model.model.name]
             - active = last_used.try(:today?)
             %td
               %span.show= link_to capitalize_first_letter(abstract_model.config.label_plural), index_path, class: 'pjax'
@@ -21,11 +21,11 @@
                 = time_ago_in_words last_used
                 = t "admin.misc.ago"
             %td
-              - count = @count[abstract_model.pretty_name]
+              - count = @count[abstract_model.model.name]
               - percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1
               .progress{style: "margin-bottom:0px", class: "progress-#{get_indicator(percent)} #{active && 'active progress-striped'}"  }
                 .progress-bar.animate-width-to{:class => "progress-bar-#{get_indicator(percent)}", :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
-                  = @count[abstract_model.pretty_name]
+                  = @count[abstract_model.model.name]
             %td.links
               %ul.inline.list-inline= menu_for :collection, abstract_model, nil, true
 - if @auditing_adapter && authorized?(:history_index)

data/app/views/rails_admin/main/export.html.haml CHANGED Viewed

@@ -23,7 +23,7 @@
             %label.checkbox{for: "schema_#{list}_#{field.method_name}"}
               = check_box_tag "schema[#{list}][]", field.method_name, true, { id: "schema_#{list}_#{field.method_name}" }
               = field.label + " [id]"
-            - polymorphic_type_column_name = @abstract_model.properties.find {|p| field.association.foreign_type == p.name }.name
+            - polymorphic_type_column_name = @abstract_model.properties.detect {|p| field.association.foreign_type == p.name }.name
             %label.checkbox{for: "schema_#{list}_#{polymorphic_type_column_name}"}
               = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
               = capitalize_first_letter(field.label) + " [type]"
@@ -68,16 +68,16 @@
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
         %p.help-block= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep'))
-  %br
-  .form-actions
-    %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
-    %button.btn.btn-primary{type: "submit", name: 'csv'}
-      %i.icon-white.icon-ok
-      = t("admin.export.confirmation", name: 'csv')
-    %button.btn.btn-info{type: "submit", name: 'json'}
-      = t("admin.export.confirmation", name: 'json')
-    %button.btn.btn-info{type: "submit", name: 'xml'}
-      = t("admin.export.confirmation", name: 'xml')
-    %button.btn{type: "submit", name: "_continue"}
-      %i.icon-remove
-      = t("admin.form.cancel")
+  .form-group.form-actions
+    .col-sm-offset-2.col-sm-10
+      %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
+      %button.btn.btn-primary{type: "submit", name: 'csv'}
+        %i.icon-white.icon-ok
+        = t("admin.export.confirmation", name: 'csv')
+      %button.btn.btn-info{type: "submit", name: 'json'}
+        = t("admin.export.confirmation", name: 'json')
+      %button.btn.btn-info{type: "submit", name: 'xml'}
+        = t("admin.export.confirmation", name: 'xml')
+      %button.btn{type: "submit", name: "_continue"}
+        %i.icon-remove
+        = t("admin.form.cancel")

data/lib/rails_admin/config.rb CHANGED Viewed

@@ -53,6 +53,9 @@ module RailsAdmin
       # Set the max width of columns in list view before a new set is created
       attr_accessor :total_columns_width
+      # set parent controller
+      attr_accessor :parent_controller
       # Stores model configuration objects in a hash identified by model's class
       # name.
       #
@@ -270,6 +273,7 @@ module RailsAdmin
         @registry = {}
         @navigation_static_links = {}
         @navigation_static_label = nil
+        @parent_controller = '::ApplicationController'
         RailsAdmin::Config::Actions.reset
       end
@@ -302,7 +306,7 @@ module RailsAdmin
       end
       def viable_models
-        included_models.collect(&:to_s).presence || (
+        included_models.collect(&:to_s).presence || begin
           @@system_models ||= # memoization for tests
             ([Rails.application] + Rails::Engine.subclasses.collect(&:instance)).flat_map do |app|
               (app.paths['app/models'].to_a + app.config.autoload_paths).collect do |load_path|
@@ -314,7 +318,7 @@ module RailsAdmin
                 end
               end
             end.flatten.reject { |m| m.starts_with?('Concerns::') } # rubocop:disable MultilineBlockChain
-          )
+        end
       end
       def visible_models_with_bindings(bindings)

data/lib/rails_admin/config/actions/base.rb CHANGED Viewed

@@ -32,7 +32,7 @@ module RailsAdmin
           bindings[:abstract_model].nil? || (
             (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
             ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
-            bindings[:abstract_model].config.with(bindings).visible?
+            !bindings[:abstract_model].config.excluded?
           )
         end

data/lib/rails_admin/config/actions/bulk_delete.rb CHANGED Viewed

@@ -15,27 +15,40 @@ module RailsAdmin
         register_instance_option :controller do
           proc do
             if request.post? # BULK DELETE
               @objects = list_entries(@model_config, :destroy)
-              render @action.template_name
+              if @objects.blank?
+                flash[:error] = t('admin.flash.error', name: pluralize(0, @model_config.label), action: t('admin.actions.delete.done'))
+                redirect_to index_path
+              else
+                render @action.template_name
+              end
             elsif request.delete? # BULK DESTROY
-              @objects = list_entries(@model_config, :destroy)
-              processed_objects = @abstract_model.destroy(@objects)
-              destroyed = processed_objects.select(&:destroyed?)
-              not_destroyed = processed_objects - destroyed
+              destroyed = nil
+              not_destroyed = nil
-              destroyed.each do |object|
-                @auditing_adapter && @auditing_adapter.delete_object(object, @abstract_model, _current_user)
+              unless params[:bulk_ids].blank?
+                @objects = list_entries(@model_config, :destroy)
+                unless @objects.blank?
+                  processed_objects = @abstract_model.destroy(@objects)
+                  destroyed = processed_objects.select(&:destroyed?)
+                  not_destroyed = processed_objects - destroyed
+                  destroyed.each do |object|
+                    @auditing_adapter && @auditing_adapter.delete_object(object, @abstract_model, _current_user)
+                  end
+                end
               end
-              flash[:success] = t('admin.flash.successful', name: pluralize(destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless destroyed.empty?
-              flash[:error] = t('admin.flash.error', name: pluralize(not_destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless not_destroyed.empty?
-              redirect_to back_or_index
+              if destroyed.nil?
+                msg = t('admin.flash.error', name: pluralize(0, @model_config.label), action: t('admin.actions.delete.done'))
+                render text: msg, status: :not_found
+              else
+                flash[:success] = t('admin.flash.successful', name: pluralize(destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless destroyed.empty?
+                flash[:error] = t('admin.flash.error', name: pluralize(not_destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless not_destroyed.empty?
+                redirect_to back_or_index
+              end
             end
           end

data/lib/rails_admin/config/actions/dashboard.rb CHANGED Viewed

@@ -25,9 +25,9 @@ module RailsAdmin
                 scope = @authorization_adapter && @authorization_adapter.query(:index, t)
                 current_count = t.count({}, scope)
                 @max = current_count > @max ? current_count : @max
-                @count[t.pretty_name] = current_count
+                @count[t.model.name] = current_count
                 next unless t.properties.detect { |c| c.name == :updated_at }
-                @most_recent_changes[t.pretty_name] = t.first(sort: "#{t.table_name}.updated_at").try(:updated_at)
+                @most_recent_changes[t.model.name] = t.first(sort: "#{t.table_name}.updated_at").try(:updated_at)
               end
             end
             render @action.template_name, status: (flash[:error].present? ? :not_found : 200)

data/lib/rails_admin/config/fields.rb CHANGED Viewed

@@ -6,7 +6,7 @@ module RailsAdmin
       #
       # @see RailsAdmin::Config::Fields.registry
       mattr_reader :default_factory
-      @@default_factory = lambda do |parent, properties, fields|
+      @@default_factory = proc do |parent, properties, fields|
         # If it's an association
         if properties.association?
           association = parent.abstract_model.associations.detect { |a| a.name.to_s == properties.name.to_s }

data/lib/rails_admin/config/fields/base.rb CHANGED Viewed

@@ -174,7 +174,8 @@ module RailsAdmin
             abstract_model.model.validators_on(column_name).detect do |v|
               !(v.options[:allow_nil] || v.options[:allow_blank]) &&
               [:presence, :numericality, :attachment_presence].include?(v.kind) &&
-              (v.options[:on] == context || v.options[:on].blank?)
+              (v.options[:on] == context || v.options[:on].blank?) &&
+              (v.options[:if].blank? && v.options[:unless].blank?)
             end
           end
         end

data/lib/rails_admin/config/fields/types/all.rb CHANGED Viewed

@@ -26,5 +26,7 @@ require 'rails_admin/config/fields/types/color'
 require 'rails_admin/config/fields/types/ck_editor'
 require 'rails_admin/config/fields/types/code_mirror'
 require 'rails_admin/config/fields/types/wysihtml5'
+require 'rails_admin/config/fields/types/froala'
 require 'rails_admin/config/fields/types/json'
 require 'rails_admin/config/fields/types/inet'
+require 'rails_admin/config/fields/types/uuid'

data/lib/rails_admin/config/fields/types/boolean.rb CHANGED Viewed

@@ -25,6 +25,10 @@ module RailsAdmin
             value.inspect
           end
+          register_instance_option :partial do
+            :form_boolean
+          end
           # Accessor for field's help text displayed below input field.
           def generic_help
             ''

data/lib/rails_admin/config/fields/types/froala.rb ADDED Viewed

@@ -0,0 +1,37 @@
+require 'rails_admin/config/fields/base'
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Froala < RailsAdmin::Config::Fields::Types::Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+          # If you want to have a different toolbar configuration for wysihtml5
+          # you can use a Ruby hash to configure these options:
+          # https://github.com/jhollingworth/bootstrap-wysihtml5/#advanced
+          register_instance_option :config_options do
+            nil
+          end
+          register_instance_option :css_location do
+            ActionController::Base.helpers.asset_path('froala_editor.min.css')
+          end
+          register_instance_option :js_location do
+            ActionController::Base.helpers.asset_path('froala_editor.min.js')
+          end
+          register_instance_option :partial do
+            :form_froala
+          end
+          [:config_options, :css_location, :js_location].each do |key|
+            register_deprecated_instance_option :"froala_#{key}", key
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/fields/types/has_one_association.rb CHANGED Viewed

@@ -34,7 +34,7 @@ module RailsAdmin
           end
           def method_name
-            nested_form ? "#{name}_attributes".to_sym  : "#{name}_id".to_sym
+            nested_form ? "#{name}_attributes".to_sym : "#{name}_id".to_sym
           end
           def multiple?

data/lib/rails_admin/config/fields/types/uuid.rb ADDED Viewed

@@ -0,0 +1,13 @@
+require 'rails_admin/config/fields/types/string'
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Uuid < RailsAdmin::Config::Fields::Types::String
+          RailsAdmin::Config::Fields::Types.register(self)
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/has_fields.rb CHANGED Viewed

@@ -25,13 +25,13 @@ module RailsAdmin
           else
             properties = abstract_model.properties.detect { |p| name == p.name }
           end
-          field = (_fields <<  RailsAdmin::Config::Fields::Types.load(type).new(self, name, properties)).last
+          field = (_fields << RailsAdmin::Config::Fields::Types.load(type).new(self, name, properties)).last
         end
         # If field has not been yet defined add some default properties
         if add_to_section && !field.defined
           field.defined = true
-          field.order = _fields.select(&:defined).length
+          field.order = _fields.count(&:defined)
         end
         # If a block has been given evaluate it and sort fields after that
@@ -51,7 +51,7 @@ module RailsAdmin
           _fields.select { |f| f.instance_eval(&block) }.each do |f|
             next if f.defined
             f.defined = true
-            f.order = _fields.select(&:defined).length
+            f.order = _fields.count(&:defined)
           end
         else
           fields(*field_names, &block)
@@ -60,7 +60,7 @@ module RailsAdmin
       # exclude fields by name or by condition (block)
       def exclude_fields(*field_names, &block)
-        block ||= lambda { |f| field_names.include?(f.name) }
+        block ||= proc { |f| field_names.include?(f.name) }
         _fields.each { |f| f.defined = true } if _fields.select(&:defined).empty?
         _fields.select { |f| f.instance_eval(&block) }.each { |f| f.defined = false }
       end
@@ -91,7 +91,7 @@ module RailsAdmin
         defined.collect do |f|
           unless f.defined
             f.defined = true
-            f.order = _fields.select(&:defined).length
+            f.order = _fields.count(&:defined)
           end
           f.instance_eval(&block) if block
           f

data/lib/rails_admin/extensions/cancan.rb CHANGED Viewed

@@ -1,5 +1,3 @@
 require 'rails_admin/extensions/cancan/authorization_adapter'
-RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCan,
-                         authorization: true
-)
+RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCan, authorization: true)

data/lib/rails_admin/extensions/cancancan.rb CHANGED Viewed

@@ -1,5 +1,3 @@
 require 'rails_admin/extensions/cancancan/authorization_adapter'
-RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCanCan,
-                         authorization: true
-)
+RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCanCan, authorization: true)

data/lib/rails_admin/extensions/history.rb CHANGED Viewed

@@ -1,5 +1,3 @@
 require 'rails_admin/extensions/history/auditing_adapter'
-RailsAdmin.add_extension(:history, RailsAdmin::Extensions::History,
-                         auditing: true
-)
+RailsAdmin.add_extension(:history, RailsAdmin::Extensions::History, auditing: true)

data/lib/rails_admin/extensions/paper_trail.rb CHANGED Viewed

@@ -1,5 +1,3 @@
 require 'rails_admin/extensions/paper_trail/auditing_adapter'
-RailsAdmin.add_extension(:paper_trail, RailsAdmin::Extensions::PaperTrail,
-                         auditing: true
-)
+RailsAdmin.add_extension(:paper_trail, RailsAdmin::Extensions::PaperTrail, auditing: true)

data/lib/rails_admin/support/csv_converter.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require 'csv'
 module RailsAdmin
   class CSVConverter
-    UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
+    UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE', 'utf8mb4']
     TARGET_ENCODINGS = %w(UTF-8 UTF-16LE UTF-16BE UTF-32LE UTF-32BE UTF-7 ISO-8859-1 ISO-8859-15 IBM850 MacRoman Windows-1252 ISO-8859-3 IBM852 ISO-8859-2 Windows-1250 IBM855 ISO-8859-5 KOI8-R MacCyrillic Windows-1251 IBM866 GB2312 GBK GB18030 Big5 Big5-HKSCS EUC-TW EUC-JP ISO-2022-JP Shift_JIS EUC-KR)
     def initialize(objects = [], schema = {})
       return self if (@objects = objects).blank?

data/lib/rails_admin/version.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 7
+    PATCH = 8
     PRE = nil
     class << self

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -424,10 +424,12 @@ files:
 - app/views/kaminari/twitter-bootstrap/_prev_page.html.haml
 - app/views/layouts/rails_admin/_navigation.html.haml
 - app/views/layouts/rails_admin/_secondary_navigation.html.haml
+- app/views/layouts/rails_admin/_sidebar_navigation.html.haml
 - app/views/layouts/rails_admin/application.html.haml
 - app/views/layouts/rails_admin/pjax.html.haml
 - app/views/rails_admin/main/_dashboard_history.html.haml
 - app/views/rails_admin/main/_delete_notice.html.haml
+- app/views/rails_admin/main/_form_boolean.html.haml
 - app/views/rails_admin/main/_form_ck_editor.html.haml
 - app/views/rails_admin/main/_form_code_mirror.html.haml
 - app/views/rails_admin/main/_form_colorpicker.html.haml
@@ -437,6 +439,7 @@ files:
 - app/views/rails_admin/main/_form_file_upload.html.haml
 - app/views/rails_admin/main/_form_filtering_multiselect.html.haml
 - app/views/rails_admin/main/_form_filtering_select.html.haml
+- app/views/rails_admin/main/_form_froala.html.haml
 - app/views/rails_admin/main/_form_nested_many.html.haml
 - app/views/rails_admin/main/_form_nested_one.html.haml
 - app/views/rails_admin/main/_form_polymorphic_association.html.haml
@@ -517,6 +520,7 @@ files:
 - lib/rails_admin/config/fields/types/enum.rb
 - lib/rails_admin/config/fields/types/file_upload.rb
 - lib/rails_admin/config/fields/types/float.rb
+- lib/rails_admin/config/fields/types/froala.rb
 - lib/rails_admin/config/fields/types/has_and_belongs_to_many_association.rb
 - lib/rails_admin/config/fields/types/has_many_association.rb
 - lib/rails_admin/config/fields/types/has_one_association.rb
@@ -532,6 +536,7 @@ files:
 - lib/rails_admin/config/fields/types/text.rb
 - lib/rails_admin/config/fields/types/time.rb
 - lib/rails_admin/config/fields/types/timestamp.rb
+- lib/rails_admin/config/fields/types/uuid.rb
 - lib/rails_admin/config/fields/types/wysihtml5.rb
 - lib/rails_admin/config/groupable.rb
 - lib/rails_admin/config/has_description.rb
@@ -588,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Admin for Rails