rails_admin 1.4.3 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2511d4339254d5f386a4b2730f4dd468526dc5bffec56a265113c003c8906b6
-  data.tar.gz: bacfe19f0d8622834410c587a188061f1ed423a61e598bde8d23c8002b8e1a44
+  metadata.gz: 286d5b253a622e6ece58238f4b18544e53e0650f427ba1f0f4d4b3b880a46032
+  data.tar.gz: 21b11784af9577e8823db1fe56f4e87a187c962d632788e61ced23ea9af99214
 SHA512:
-  metadata.gz: 90a5aed673d2db9af5c31fa297a5e155cf9edbe23a281020cb30a7f07f644dfaf70b4fbddb6aaf806d8815f398c6861711441be6378d154c97736f7fcd6ebf13
-  data.tar.gz: 44144612bdc0eb7be539d3d730b1a0bddfe4686161e322f56d05df758427959e4aba3ef73305e792038ae82cccaa410e72ba750f51be804674d2fd9ef08509cb
+  metadata.gz: 2e89158a576546098a11cf0c660f84a43130bbc69e57d592e68e65a3adce27461e811c93649a9624632d1299d10cabbdce06ff41ecb90119f42c488dc6f95f46
+  data.tar.gz: e5944858dd931bc962e2c4a3b64117464c6ef118c9bc322c4ab9c54e5103b2d07972b3f50513b59b7d50e30ca19e05839cb58a93882b81425538d3be2eb37246

data/Gemfile

@@ -10,7 +10,7 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     gem 'mysql2', '>= 0.3.14'
-    gem 'sqlite3', '~> 1.3.0'
+    gem 'sqlite3', '>= 1.3'
   end
 end
 
@@ -32,8 +32,11 @@ group :test do
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
+  gem 'rspec-expectations', '!= 3.8.3'
   gem 'rubocop', '~> 0.41.2'
   gem 'simplecov', '>= 0.9', require: false
+  gem 'shrine', '~> 2.0'
+  gem 'shrine-memory'
   gem 'timecop', '>= 0.5'
 
   platforms :ruby_19 do

data/README.md

@@ -50,7 +50,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', '~> 1.3'`
+1. On your gemfile: `gem 'rails_admin', '~> 2.0.0.beta'`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked
@@ -96,13 +96,11 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby implementations:
 
-* Ruby 2.1
 * Ruby 2.2
 * Ruby 2.3
 * Ruby 2.4
 * Ruby 2.5
-* [Rubinius][]
+* Ruby 2.6
 * [JRuby][]
 
-[rubinius]: http://rubinius.com
 [jruby]: http://jruby.org/

data/app/assets/javascripts/rails_admin/jquery.pjax.js

@@ -188,8 +188,6 @@ function pjax(options) {
     xhr.setRequestHeader('X-PJAX', 'true')
     xhr.setRequestHeader('X-PJAX-Container', context.selector)
 
-    var result
-
     if (!fire('pjax:beforeSend', [xhr, settings]))
       return false
 
@@ -437,7 +435,7 @@ function fallbackPjax(options) {
       form.append($('<input>', {type: 'hidden', name: pair[0], value: pair[1]}))
     })
   } else if (typeof data === 'object') {
-    for (key in data)
+    for (var key in data)
       form.append($('<input>', {type: 'hidden', name: key, value: data[key]}))
   }
 

data/app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -31,21 +31,22 @@
     button: null,
     input: null,
     select: null,
+    filtering_select: null,
 
     _create: function() {
-      var filtering_select = this.element.siblings(
+      this.filtering_select = this.element.siblings(
         '[data-input-for="' + this.element.attr('id') + '"]'
       );
 
       // When using the browser back and forward buttons, it is possible that
       // the autocomplete field will be cached which causes duplicate fields
       // to be generated.
-      if (filtering_select.length > 0) {
-        this.input = filtering_select.children('input');
-        this.button = filtering_select.children('.input-group-btn');
+      if (this.filtering_select.length > 0) {
+        this.input = this.filtering_select.children('input');
+        this.button = this.filtering_select.children('.input-group-btn');
       } else {
         this.element.hide();
-        filtering_select = this._inputGroup(this.element.attr('id'));
+        this.filtering_select = this._inputGroup(this.element.attr('id'));
         this.input = this._inputField();
         this.button = this._buttonField();
       }
@@ -56,7 +57,7 @@
       this._overloadRenderItem();
       this._autocompleteDropdownEvent(this.button);
 
-      return filtering_select.append(this.input)
+      return this.filtering_select.append(this.input)
         .append(this.button)
         .insertAfter(this.element);
     },
@@ -201,7 +202,7 @@
       return $('<div>')
         .addClass('input-group filtering-select col-sm-2')
         .attr('data-input-for', inputFor)
-        .css('float', 'left');
+        .css('float', this.element.css("float"));
     },
 
     _initAutocomplete: function() {
@@ -286,6 +287,7 @@
       this.input.remove();
       this.button.remove();
       this.element.show();
+      this.filtering_select.remove();
       $.Widget.prototype.destroy.call(this);
     }
   });

data/app/assets/javascripts/rails_admin/ra.nested-form-hooks.coffee

@@ -9,9 +9,6 @@ $(document).ready ->
 $(document).on 'nested:fieldAdded', 'form', (content) ->
   field = content.field.addClass('tab-pane').attr('id', 'unique-id-' + (new Date().getTime()))
   new_tab = $('<li><a data-toggle="tab" href="#' + field.attr('id') + '">' + field.children('.object-infos').data('object-label') + '</a></li>')
-  new_tab = $('<li></li>').append(
-    $('<a></a>').attr('data-toggle', 'tab').attr('href', '#' + field.attr('id')).text(field.children('.object-infos').data('object-label'))
-  )
   parent_group = field.closest('.control-group')
   controls = parent_group.children('.controls')
   one_to_one = controls.data('nestedone') != undefined
@@ -27,7 +24,7 @@ $(document).on 'nested:fieldAdded', 'form', (content) ->
   toggler.addClass('active').removeClass('disabled').children('i').addClass('icon-chevron-down').removeClass('icon-chevron-right')
 
   # Convert the "add nested field" button to just showing the title of the new model
-  controls.find('.add_nested_fields').removeClass('add_nested_fields').text(field.children('.object-infos').data('object-label')) if one_to_one
+  controls.find('.add_nested_fields').removeClass('add_nested_fields').html(field.children('.object-infos').data('object-label')) if one_to_one
 
 $(document).on 'nested:fieldRemoved', 'form', (content) ->
   field = content.field

data/app/assets/javascripts/rails_admin/ra.sidescroll.coffee

@@ -0,0 +1,19 @@
+(->
+  $ = jQuery
+
+  setFrozenColPositions = ->
+    $listForm = $('#bulk_form')
+    return unless $listForm.is('.ra-sidescroll')
+    frozenColumns = $listForm.data('ra-sidescroll')
+    $listForm.find('table tr').each (index, tr) ->
+      firstPosition = 0
+      $(tr).children().slice(0, frozenColumns).each (idx, td) ->
+        $(td).addClass('ra-sidescroll-frozen')
+        $(td).addClass('last-of-frozen') if idx == frozenColumns - 1
+        tdLeft = $(td).position().left
+        firstPosition = tdLeft if idx == 0
+        td.style.left = "#{tdLeft - firstPosition}px"
+
+  $(window).on('load', setFrozenColPositions) # Update after link icons load.
+  $(document).on('rails_admin.dom_ready', setFrozenColPositions)
+)()

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

@@ -48,9 +48,12 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
     # fileupload
 
     content.find('[data-fileupload]').each ->
-      input = this
-      $(this).on 'click', ".delete input[type='checkbox']", ->
-        $(input).children('.toggle').toggle('slow')
+      parent = $(this).closest('.controls')
+      parent.find('.btn-remove-image').on 'click', ->
+        $(this).siblings('[type=checkbox]').click()
+        parent.find('.toggle').toggle('slow')
+        $(this).toggleClass('btn-danger btn-info')
+        false
 
     # fileupload-preview
 
@@ -70,6 +73,15 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
       else
         image_container.hide()
 
+    # multiple-fileupload
+
+    content.find('[data-multiple-fileupload]').each ->
+      $(this).closest('.controls').find('.btn-remove-image').on 'click', ->
+        $(this).siblings('[type=checkbox]').click()
+        $(this).parent('.toggle').toggle('slow')
+        $(this).toggleClass('btn-danger btn-info')
+        false
+
     # multiple-fileupload-preview
 
     content.find('[data-multiple-fileupload]').change ->
@@ -115,11 +127,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
       # add each nested field to a tab-pane and reference it in the nav
       tab_content.children('.fields:not(.tab-pane)').addClass('tab-pane').each ->
         $(this).attr('id', 'unique-id-' + (new Date().getTime()) + Math.floor(Math.random()*100000)) # some elements are created on the same ms
-        nav.append(
-          $('<li></li>').append(
-            $('<a></a>').attr('data-toggle', 'tab').attr('href', '#' + this.id).text($(this).children('.object-infos').data('object-label'))
-          )
-        )
+        nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>')
       # only if no tab is set to active
       if nav.find("> li.active").length == 0
         # init first tab, toggler and tab_content/tabs visibility
@@ -147,12 +155,8 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
       toggler = field.find('> .controls > .btn-group > .toggler')
       tab_content.children(".fields:not(.tab-pane)").addClass('tab-pane active').each ->
         # Convert the "add nested field" button to just showing the title of the new model
-        field.find('> .controls .add_nested_fields').removeClass('add_nested_fields').text( $(this).children('.object-infos').data('object-label') )
-        nav.append(
-          $('<li></li>').append(
-            $('<a></a>').attr('data-toggle', 'tab').attr('href', '#' + this.id).text($(this).children('.object-infos').data('object-label'))
-          )
-        )
+        field.find('> .controls .add_nested_fields').removeClass('add_nested_fields').html( $(this).children('.object-infos').data('object-label') )
+        nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>')
       first_tab = nav.find("> li > a[data-toggle='tab']:first")
       first_tab.tab('show')
       field.find("> .controls > [data-target]:first").html('<i class="icon-white"></i> ' + first_tab.html())
@@ -176,25 +180,13 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
       field = type_select.parents('.control-group').first()
       object_select = field.find('select').last()
       urls = type_select.data('urls')
+
       type_select.on 'change', (e) ->
-        if $(this).val() is ''
-          object_select.html('<option value=""></option>')
-        else
-          $.ajax
-            url: urls[type_select.val()]
-            data:
-              compact: true
-              all: true
-            beforeSend: (xhr) ->
-              xhr.setRequestHeader("Accept", "application/json")
-            success: (data, status, xhr) ->
-              html = $('<option></option>')
-              $(data).each (i, el) ->
-                option = $('<option></option>')
-                option.attr('value', el.id)
-                option.text(el.label)
-                html = html.add(option)
-              object_select.html(html)
+        selected_type = type_select.val().toLowerCase()
+        selected_data = $("##{selected_type}-js-options").data('options')
+        object_select.data('options', selected_data)
+        object_select.filteringSelect("destroy")
+        object_select.filteringSelect selected_data
 
 
     # simplemde
@@ -302,9 +294,9 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
             authenticity_token: $('meta[name=csrf-token]').attr('content')
 
         $(@).addClass('froala-wysiwyged')
-        $(@).editable(config_options)
+        $(@).froalaEditor(config_options)
         if uploadEnabled
-          $(@).on 'editable.imageError', (e, editor, error) ->
+          $(@).on 'froalaEditor.image.error', (e, editor, error) ->
             alert("error uploading image: " + error.message);
             # Custom error message returned from the server.
             if error.code == 0
@@ -334,7 +326,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
 
             return
 
-          .on('editable.afterRemoveImage', (e, editor, $img) ->
+          .on('froalaEditor.image.removed', (e, editor, $img) ->
             # Set the image source to the image delete params.
             editor.options.imageDeleteParams =
               src: $img.attr('src')
@@ -357,3 +349,11 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
           goFroalaWysiwygs(array)
       else
         goFroalaWysiwygs(array)
+
+    # action_text
+
+    content.find('trix-editor').each ->
+      if !window.Trix
+        options = $(this).data('options')
+        $('head').append('<link href="' + options['csspath'] + '" rel="stylesheet" media="all" type="text\/css">')
+        $.getScript options['jspath']

data/app/assets/javascripts/rails_admin/rails_admin.js

@@ -15,5 +15,6 @@
 //=  require 'rails_admin/ra.i18n'
 //=  require 'rails_admin/bootstrap/bootstrap'
 //=  require 'rails_admin/ra.widgets'
+//=  require 'rails_admin/ra.sidescroll'
 //=  require 'rails_admin/ui'
 //=  require 'rails_admin/custom/ui'

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

@@ -53,12 +53,16 @@ $(document).on 'click', 'form .tab-content .tab-pane a.remove_nested_one_fields'
     siblings('i').toggleClass('icon-check icon-trash')
 
 $(document).ready ->
+  RailsAdmin.I18n.init $('html').attr('lang'), $("#admin-js").data('i18nOptions')
   $(document).trigger('rails_admin.dom_ready')
 
 $(document).on 'pjax:end', ->
   $(document).trigger('rails_admin.dom_ready')
 
 $(document).on 'rails_admin.dom_ready', ->
+  $('.nav.nav-pills li.active').removeClass('active')
+  $(".nav.nav-pills li[data-model=\"#{$('.page-header').data('model')}\"]").addClass('active')
+
   $('.animate-width-to').each ->
     length = $(this).data("animate-length")
     width = $(this).data("animate-width-to")
@@ -74,6 +78,23 @@ $(document).on 'rails_admin.dom_ready', ->
   $('[formnovalidate]').on 'click', ->
     $(this).closest('form').attr('novalidate', true)
 
+  $.each $('#filters_box').data('options'), ->
+    $.filters.append(this)
+
+# Interactions for index action
+$(document).on 'click', ".bulk-link", (event) ->
+  event.preventDefault()
+  $('#bulk_action').val($(this).data('action'))
+  $('#bulk_form').submit()
+
+$(document).on 'click', "#remove_filter", (event) ->
+  event.preventDefault()
+  $("#filters_box").html("")
+  $("hr.filters_box").hide()
+  $(this).parent().siblings("input[type='search']").val("")
+  $(this).parents("form").submit()
+
+# Interactions for export action
 $(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'
@@ -81,22 +102,6 @@ $(document).on 'click', '#fields_to_export label input#check_all', () ->
   else
     $(elems).prop('checked',false)
 
-# when the user hits the back button, the inline JS <script> that
-# highlights the current model in the left menu doesn't get run by
-# pjax, so this code runs it:
-# https://github.com/defunkt/jquery-pjax/issues/241#issuecomment-13251065
-$(document).on 'pjax:popstate', () ->
-  $(document).one 'pjax:end', (event) ->
-    $(event.target).find('script').each () ->
-      $.globalEval(this.text || this.textContent || this.innerHTML || '')
-      return
-    return
-  return
+$(document).on 'click', '#fields_to_export .reverse-selection', () ->
+  $(this).closest(".control-group").find(".controls").find("input").click()
 
-#Remove all filter and then refresh
-$(document).on 'click',  "#remove_filter",(event) ->
-  event.preventDefault()
-  $("#filters_box").html("")
-  $("hr.filters_box").hide()
-  $(this).parent().siblings("input[type='search']").val("")
-  $(this).parents("form").submit()  

data/app/assets/stylesheets/rails_admin/ra.sidescroll.scss

@@ -0,0 +1,29 @@
+.ra-sidescroll {
+  margin-bottom: 20px;
+  overflow-x: auto;
+  .table {
+    margin-bottom: 0;
+  }
+
+  .ra-sidescroll-frozen {
+    position: sticky;
+
+    // border-right isn't sticky
+    &.last-of-frozen {
+      box-shadow: -1px 0 0 0 $table-border-color inset;
+      padding-right: $table-condensed-cell-padding + 1px;
+    }
+  }
+
+  // Remove transparency on frozen cells.
+  $table-bg-default: if($table-bg == transparent, if($body-bg == transparent, #fff, $body-bg), $table-bg) !default;
+  .table-striped > tbody > tr:nth-child(even) > td, .table-striped > thead > tr > th {
+    background-color: $table-bg-default;
+  }
+  $table-bg-header-sort: #e2eff6 !default;
+  .table .ra-sidescroll-frozen {
+    &.headerSortUp, &.headerSortDown {
+      background-color: $table-bg-header-sort;
+    }
+  }
+}

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

@@ -55,12 +55,13 @@
 @import "rails_admin/bootstrap-datetimepicker-build";
 @import "rails_admin/ra.filtering-multiselect";
 @import "rails_admin/ra.widgets";
+@import "rails_admin/ra.sidescroll";
 @import "rails_admin/jquery.colorpicker";
 
 
 /*** Font-awesome ***/
 
-@import 'font-awesome';
+@import 'rails_admin/font-awesome';
 @import 'rails_admin/base/font-awesome-4-compability';
 
 /***  Bootstrap Theming  ***/

data/app/helpers/rails_admin/application_helper.rb

@@ -160,7 +160,7 @@ module RailsAdmin
           content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
             actions.collect do |action|
               content_tag :li do
-                link_to wording_for(:bulk_link, action), '#', onclick: "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
+                link_to wording_for(:bulk_link, action, abstract_model), '#', class: 'bulk-link', data: {action: action.action_name}
               end
             end.join.html_safe
           end

data/app/helpers/rails_admin/main_helper.rb

@@ -56,8 +56,8 @@ module RailsAdmin
       end.to_a.sort_by(&:first)
     end
 
-    def ordered_filter_string
-      @ordered_filter_string ||= ordered_filters.map do |duplet|
+    def ordered_filter_options
+      @ordered_filter_options ||= ordered_filters.map do |duplet|
         options = {index: duplet[0]}
         filter_for_field = duplet[1]
         filter_name = filter_for_field.keys.first
@@ -77,8 +77,8 @@ module RailsAdmin
         options[:value] = filter_hash['v']
         options[:label] = field.label
         options[:operator] = filter_hash['o']
-        %{$.filters.append(#{options.to_json});}
-      end.join("\n").html_safe if ordered_filters
+        options
+      end if ordered_filters
     end
   end
 end

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

@@ -10,9 +10,6 @@
     = javascript_include_tag "rails_admin/rails_admin.js"
   %body.rails_admin
     #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
-    -# Initialize JS simple i18n
-    :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     %nav.navbar.navbar-default.navbar-fixed-top
       = render "layouts/rails_admin/navigation"