ab_admin 0.2.3 → 0.3.0

data/Gemfile

@@ -16,10 +16,10 @@ gem 'configatron'
 gem 'ransack'
 gem 'has_scope'
 gem 'friendly_id'
-gem 'galetahub-enum_field', :require => 'enum_field'
+gem 'galetahub-enum_field', require: 'enum_field'
 gem 'awesome_nested_set'
-gem 'sunrise-file-upload', :git => 'git://github.com/leschenko/sunrise-file-upload.git', :ref => '53da968'
-gem 'globalize3', :git => 'git://github.com/leschenko/globalize3.git', :ref => '586ccbd'
+gem 'sunrise-file-upload', git: 'git://github.com/leschenko/sunrise-file-upload.git', ref: '53da968'
+gem 'globalize3', git: 'git://github.com/leschenko/globalize3.git', ref: '586ccbd'
 
 gem 'carrierwave'
 gem 'mini_magick'
@@ -57,7 +57,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'cucumber-rails', :require => false
+  gem 'cucumber-rails', require: false
   gem 'capybara'
   gem 'shoulda-matchers'
   gem 'database_cleaner'
@@ -65,8 +65,8 @@ group :test do
   gem 'fuubar'
   gem 'guard-rspec'
   gem 'guard-cucumber'
-  gem 'rb-fsevent', :require => false
-  gem 'growl', :require => false
+  gem 'rb-fsevent', require: false
+  gem 'growl', require: false
 end
 
 group :development do

data/Guardfile

@@ -2,18 +2,18 @@ notification :growl
 ignore /vendor/, /public/, /etc/
 
 group :rspec do
-  guard 'rspec', :all_on_start => false, :all_after_pass => false, :cli => '--tag @focus' do
+  guard 'rspec', all_on_start: false, all_after_pass: false, cli: '--tag @focus' do
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
-    watch('spec/spec_helper.rb') { "spec" }
+    watch('spec/spec_helper.rb') { 'spec' }
 
     # Rails example
     watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
     watch(%r{^app/(.*)(\.slim|\.erb|\.haml)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
     watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/features/#{m[1]}_spec.rb"] }
-    watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
-    watch('config/routes.rb') { "spec/routing" }
-    watch('app/controllers/application_controller.rb') { "spec/controllers" }
+    watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
+    watch('config/routes.rb') { 'spec/routing' }
+    watch('app/controllers/application_controller.rb') { 'spec/controllers' }
     watch(%r{lib/generators/ab_admin/.+/(.+)\.rb}) { |m| "spec/generators/#{m[1]}_spec.rb" }
 
     # Capybara request specs
@@ -26,7 +26,7 @@ group :rspec do
 end
 
 group :cucumber do
-  guard 'cucumber', :cli => '--profile wip', :all_after_pass => false, :all_on_start => false do
+  guard 'cucumber', cli: '--profile wip', all_after_pass: false, all_on_start: false do
     watch(%r{^features/.+\.feature$})
     watch(%r{^features/support/.+$}) { 'features' }
     watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/README.md

@@ -32,12 +32,12 @@ Admin resource is just a class in `app/models/ab_admin` directory like this:
 class AbAdminProduct < AbAdmin::AbstractResource
   preview_path :product_path
 
-  settings :comments => true
+  settings comments: true
 
   table do
     field :sku
     field(:picture) { |item| item_image_link(item) }
-    field :name, :sortable => {:column => :id, :default_order => 'desc'}
+    field :name, sortable: {column: :id, default_order: 'desc'}
     field :is_visible
     field :collection
     field :created_at
@@ -66,13 +66,13 @@ class AbAdminProduct < AbAdmin::AbstractResource
       field :price
     end
     field :is_visible
-    field :collection, :as => :association
+    field :collection, as: :association
     locale_tabs do
       field :name
       field :description
     end
-    field :picture, :as => :uploader
-    field :map, :as => :map
+    field :picture, as: :uploader
+    field :map, as: :map
   end
 end
 ```

data/app/assets/javascripts/ab_admin/components/admin_assets.js.coffee

@@ -1,22 +1,24 @@
 #= require ab_admin/fileupload/fileuploader.js
 #= require ab_admin/fileupload/admin-fileuploader.js
 #= require jquery.tmpl.min
+#q= require ab_admin/jquery.Jcrop
+#q= require ab_admin/components/croppable_image
 
 class window.AdminAssets
   constructor: (@element_id, @url, @sortable) ->
+    @uploader_api = qq.FileUploader.instances[@element_id]
+    @uploader_el = $("##{@element_id}")
     @initHandlers()
+    @uploader_el.data('AdminAssets', this)
 
   initHandlers: ->
     self = this
-    query = "##{@element_id} .fileupload-list"
+    @query = "##{@element_id} .fileupload-list"
     if @sortable
-      $(".do_sort " + query).sortable
+      $(".do_sort " + @query).sortable
         revert: true
-        start: (e, ui) ->
-          ui.item.addClass "drag_sort"
-
         update: (event, ui) ->
-          data = $(query).sortable("serialize")
+          data = $(self.query).sortable("serialize")
           $.ajax
             url: self.url
             data: data
@@ -24,13 +26,14 @@ class window.AdminAssets
             type: "POST"
 
     if $.fn.fancybox
-      @initFancybox(query)
+      @initFancybox()
 
     unless window.admin_assets_first
       window.admin_assets_first = true
       @initMainImage()
       @initRemove()
       @initRotate()
+    @initCrop()
 
   initRemove: ->
     $(document).on "ajax:complete", ".fileupload .del_asset", ->
@@ -51,20 +54,18 @@ class window.AdminAssets
   initRotate: ->
     $(document).on 'click', '.fileupload .rotate_image', ->
       $asset = $(this).closest('.asset')
+      $uploader = qq.FileUploader.instances[$asset.closest('.fileupload').attr('id')]
       $.post "/admin/assets/#{$asset.data('id')}/rotate", (data) ->
-        $asset.replaceWith $('#fileupload_tmpl').tmpl(data.asset)
+        $asset.replaceWith $($uploader._options.template_id).tmpl(data.asset)
+
+  initCrop: ->
+    if @uploader_el.data('crop') && $.fn.Jcrop
+      @crop = new CroppableImage(@element_id)
+
+  initFancybox: =>
+    $(@query + " a.fancybox").fancybox
+      afterShow: => @crop?.fancyboxHandler()
 
-  initFancybox: (query) ->
-    $(query + " a.fancybox").fancybox
-      titleShow: false
-      transitionIn: "none"
-      transitionOut: "none"
-      autoScale: false
-      onStart: (items, index, opts) ->
-        obj = $(items[index]).parent()
-        if obj.hasClass("drag_sort")
-          obj.removeClass "drag_sort"
-          false
 
 #class window.AssetDescription
 #  constructor: (@assoc, @assetable_type, @assetable_id, @guid) ->

data/app/assets/javascripts/ab_admin/components/croppable_image.js.coffee

@@ -1,48 +1,32 @@
 class window.CroppableImage
-  constructor: (@uploader_el) ->
-    @uploader_api = qq.FileUploader.instances[@uploader_el.attr('id')]
-    @initHandelers()
-    @uploader_el.bind 'fileupload:onComplete', @refreshHandlers
+  @crop_defaults =
+    aspectRatio: 760 / 350
+    setSelect: [0, 0, 760, 350]
 
-  initHandelers: =>
-    @el = $('.fileupload-file.fancybox', @uploader_el)
-    @fancybox_api = @el.data('fancybox')
-    @fancybox_api?.onComplete = @fancyboxHandler
-    @fancybox_api?.onClosed = -> $('#fancybox-content').css({'z-index': 1102})
+  constructor: (@element_id, @options = {}) ->
+    @uploader_api = qq.FileUploader.instances[@element_id]
 
   fancyboxHandler: =>
-    $img = $('#fancybox-img')
-    $img.Jcrop
-      aspectRatio: 760 / 350
-      setSelect: [0, 0, 760, 350]
-      onSelect: @setCropData
-      onChange: @setCropData
-    $cont = $('#fancybox-content')
-    $cont.css({'z-index': 1103})
-    $img.load =>
-      setTimeout((=>
-        $cont.height (i, v) -> v + 35
-        $btn = $("<a href='#' class='btn btn-primary' id='crop_button'>Обрезать</a>")
-        $cont.append($btn)
-        $btn.click @cropHandler
-      ), 300)
+    _.defaults(@options, CroppableImage.crop_defaults)
+    @options.onSelect = @setCropData
+    @options.onChange = @setCropData
 
-  setCropData: (coords) =>
-    @cropData = coords
+    $('.fancybox-image:first').Jcrop @options
+    $('.fancybox-nav').hide()
 
-  render: (data) =>
-    $(@uploader_api._listElement).html $(@uploader_api._options.template_id).tmpl(data.asset)
-    $.fancybox.close()
-    @refreshHandlers()
+    $cont = $('.fancybox-outer:first')
+    $btn = $("<a href='#' class='btn btn-primary' id='crop_button'>Обрезать</a>")
+    $cont.append($btn)
+    $btn.click @cropHandler
 
-  refreshHandlers: =>
-    Manage.initFancybox('#' + @uploader_el.attr('id'))
-    @initHandelers()
+  setCropData: (coords) =>
+    @cropData = coords
 
   cropHandler: (e) =>
     e.preventDefault()
-    action = @uploader_api._options.action
-    data =
-      img_url: @el.attr('href')
-      crop_attrs: @cropData
-    $.post action, data, @render, 'json'
+    asset_id = $('.fancybox-image:first').attr('src').match(/\d+/)
+    $asset = $("#asset_#{asset_id}")
+    geometry = [@cropData['w'], @cropData['h'], @cropData['x'], @cropData['y']].join(',')
+    $.post "/admin/assets/#{$asset.data('id')}/crop", {geometry: geometry}, (data) =>
+      $asset.replaceWith $(@uploader_api._options.template_id).tmpl(data.asset)
+      $.fancybox.close()

data/app/assets/javascripts/ab_admin/components/gmaps.js.coffee

@@ -1,6 +1,6 @@
 class window.GeoInput
-  @default_lat = 55.7427928
-  @default_lon = 55.7427928
+  @default_lat = 55.7541934
+  @default_lon = 37.6184907
 
   constructor: (@cont, @options={}) ->
     @prefix = @cont.attr('id').replace(/_geo_input$/, '')

data/app/assets/javascripts/ab_admin/core/ui_utils.js.coffee

@@ -56,9 +56,13 @@ window.initFancySelect = ->
   $('form .fancy_select, form input.token, .without_form.fancy_select').each ->
     $el = $(this)
     return if $el.data('select2')
-    options = _.defaults({multiple: $el.data('multi')}, defaults)
+    options = _.defaults({}, defaults)
+    options.multiple = $el.data('multi') unless _.isUndefined($el.data('multi'))
     options.width = $el[0].style.width || 'resolve'
-    if $el.data('class')
+    if $el.data('tags')
+      options.tokenSeparators = [","]
+      options.tags = $el.data('tags')
+    else if $el.data('class')
       options.initSelection = (el, callback) ->
         data = $el.data('pre')
         if $el.data('multi')

data/app/assets/stylesheets/ab_admin/components/_base.css.scss

@@ -1,7 +1,14 @@
+html, body {
+  height: 100%;
+}
+
 #main {
   position: relative;
   clear: both;
-  margin-bottom: 50px;
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin: 0 auto -20px;
   .wrap_content {
     width: 100%;
     float: left;
@@ -29,6 +36,13 @@
   }
 }
 
+#footer {
+  height: 20px;
+  padding: 10px 50px;
+  margin-top: 20px;
+  text-align: right;
+}
+
 .tree_view {
   #columns_hider_show {
     display: none;
@@ -42,3 +56,5 @@
   bottom: 20px;
   z-index: 100000;
 }
+
+

data/app/assets/stylesheets/ab_admin/components/_form.css.scss

@@ -102,6 +102,6 @@ textarea {
 
 .simple_form {
   .fancy_select, input.token {
-    min-width: 400px;
+    width: 500px;
   }
 }

data/app/assets/stylesheets/ab_admin/main.css.scss

@@ -6,3 +6,4 @@
 //= require fancybox
 //= require ab_admin/bootstrap_and_overrides
 //= require ab_admin/fileupload
+//q= require ab_admin/jquery.Jcrop.min

data/app/controllers/admin/assets_controller.rb

@@ -1,6 +1,6 @@
 class Admin::AssetsController < ApplicationController
-  before_filter :find_klass, :only => [:create, :sort]
-  before_filter :find_asset, :only => [:destroy, :main, :rotate, :crop]
+  before_filter :find_klass, only: [:create, :sort]
+  before_filter :find_asset, only: [:destroy, :main, :rotate, :crop]
 
   respond_to :html, :xml
 
@@ -18,7 +18,7 @@ class Admin::AssetsController < ApplicationController
 
     respond_with(@asset) do |format|
       format.html { head :ok }
-      format.xml { render :xml => @asset.to_xml }
+      format.xml { render xml: @asset.to_xml }
     end
   end
 
@@ -27,7 +27,7 @@ class Admin::AssetsController < ApplicationController
 
     respond_with(@asset) do |format|
       format.html { head :ok }
-      format.xml { render :xml => @asset.to_xml }
+      format.xml { render xml: @asset.to_xml }
     end
   end
 
@@ -42,26 +42,26 @@ class Admin::AssetsController < ApplicationController
   end
 
   def rotate
-    render :json => @asset.rotate!
+    render json: @asset.rotate!
   end
 
   def main
-    render :json => @asset.main!
+    render json: @asset.main!
   end
 
   def crop
-    render :json => @asset.crop!(params[:crop_attrs])
+    render json: @asset.crop!(params[:geometry])
   end
 
   protected
 
   def find_assets
     assoc = params[:assetable_type].constantize.reflect_on_association(params[:assoc].to_sym)
-    scope = assoc.klass.where(:assetable_type => params[:assetable_type], :is_main => !assoc.collection?)
+    scope = assoc.klass.where(assetable_type: params[:assetable_type], is_main: !assoc.collection?)
     if params[:assetable_id].present?
-      scope.where(:assetable_id => params[:assetable_id])
+      scope.where(assetable_id: params[:assetable_id])
     elsif params[:guid].present?
-      scope.where(:guid => params[:guid])
+      scope.where(guid: params[:guid])
     else
       []
     end

data/app/controllers/admin/base_controller.rb

@@ -1,5 +1,5 @@
 class Admin::BaseController < ::InheritedResources::Base
-  use Rack::Pjax, :only => :index
+  use Rack::Pjax, only: :index
 
   layout :set_layout
 
@@ -7,12 +7,12 @@ class Admin::BaseController < ::InheritedResources::Base
   define_admin_callbacks :save, :create
 
   before_filter :authenticate_user!, :require_moderator
-  before_filter :add_breadcrumbs, :set_title, :set_user_vars, :unless => :xhr?
+  before_filter :add_breadcrumbs, :set_title, :set_user_vars, unless: :xhr?
 
-  class_attribute :export_builder, :batch_action_list, :instance_reader => false, :instance_writer => false
-  self.batch_action_list = [AbAdmin::Config::BatchAction.new(:destroy, :confirm => I18n.t('admin.delete_confirmation'))]
+  class_attribute :export_builder, :batch_action_list, instance_reader: false, instance_writer: false
+  self.batch_action_list = [AbAdmin::Config::BatchAction.new(:destroy, confirm: I18n.t('admin.delete_confirmation'))]
 
-  has_scope :ids, :type => :array
+  has_scope :ids, type: :array
 
   helper_method :admin?, :moderator?
 
@@ -21,19 +21,19 @@ class Admin::BaseController < ::InheritedResources::Base
 
   respond_to :json
 
-  rescue_from ::CanCan::AccessDenied, :with => :render_unauthorized
+  rescue_from ::CanCan::AccessDenied, with: :render_unauthorized
 
   def index
     super do |format|
       format.js { render collection }
       format.csv do
         doc = AbAdmin::Utils::CsvDocument.new(collection, export_options)
-        send_data(doc.render, :filename => doc.filename, :type => Mime::CSV, :disposition => 'attachment')
+        send_data(doc.render, filename: doc.filename, type: Mime::CSV, disposition: 'attachment')
       end
       if defined?(Mime::XLSX)
         format.xls do
           doc = AbAdmin::Utils::XlsDocument.new(collection, export_options)
-          send_data(doc.render, :filename => doc.filename, :type => Mime::XLSX, :disposition => 'attachment')
+          send_data(doc.render, filename: doc.filename, type: Mime::XLSX, disposition: 'attachment')
         end
       end
     end
@@ -42,8 +42,8 @@ class Admin::BaseController < ::InheritedResources::Base
   def create
     create! do |success, failure|
       success.html { redirect_to redirect_to_on_success }
-      success.js { render :layout => false }
-      failure.js { render :new, :layout => false }
+      success.js { render layout: false }
+      failure.js { render :new, layout: false }
     end
   end
 
@@ -51,8 +51,8 @@ class Admin::BaseController < ::InheritedResources::Base
     update! do |success, failure|
       success.html { redirect_to redirect_to_on_success }
       failure.html { render :edit }
-      success.js { render :layout => false }
-      failure.js { render :edit, :layout => false }
+      success.js { render layout: false }
+      failure.js { render :edit, layout: false }
     end
   end
 
@@ -62,13 +62,13 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def edit
     edit! do |format|
-      format.js { render :layout => false }
+      format.js { render layout: false }
     end
   end
 
   def new
     new! do |format|
-      format.js { render :layout => false }
+      format.js { render layout: false }
     end
   end
 
@@ -77,7 +77,7 @@ class Admin::BaseController < ::InheritedResources::Base
     batch_action = params[:batch_action].to_sym
     if allow_batch_action?(batch_action) && collection.all?{|item| can?(batch_action, item) }
       count = collection.inject(0) { |c, item| apply_batch_action(item, batch_action) ? c + 1 : c }
-      flash[:success] = I18n.t('admin.batch_actions.status', :count => count, :action => I18n.t("admin.actions.batch_#{batch_action}.title"))
+      flash[:success] = I18n.t('admin.batch_actions.status', count: count, action: I18n.t("admin.actions.batch_#{batch_action}.title"))
     else
       raise CanCan::AccessDenied
     end
@@ -107,7 +107,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def interpolation_options
     return {} if collection_action? || resource.errors.empty?
-    {:errors => resource.errors.full_messages.map { |m| "<br/> - #{m}" }.join.html_safe}
+    {errors: resource.errors.full_messages.map { |m| "<br/> - #{m}" }.join.html_safe}
   end
 
   def self.export(options={}, &block)
@@ -123,11 +123,13 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def set_title
-    lookups = [:"admin.#{controller_name}.actions.#{action_name}.title",
-               :"admin.#{controller_name}.actions.#{action_name}",
-               :"admin.actions.#{action_name}.title",
-               :"admin.actions.#{action_name}"]
-    @page_title ||= [resource_class.model_name.human(:count => 1), t(lookups.shift, :default => lookups)].join(' - ')
+    name_for_lookup = params[:custom_action] || action_name
+    lookups = [:"admin.#{controller_name}.actions.#{name_for_lookup}.title",
+               :"admin.#{controller_name}.actions.#{name_for_lookup}",
+               :"admin.actions.#{name_for_lookup}.title",
+               :"admin.actions.#{name_for_lookup}",
+               name_for_lookup]
+    @page_title ||= [resource_class.model_name.human(count: 1), t(lookups.shift, default: lookups)].join(' - ')
   end
 
   def preview_resource_path(item)
@@ -135,8 +137,8 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def settings
-    {:index_view => 'table', :sidebar => collection_action?, :well => (collection_action? || action_name == 'show'),
-     :search => true, :batch => true, :hotkeys => true}
+    {index_view: 'table', sidebar: collection_action?, well: (collection_action? || action_name == 'show'),
+     search: true, batch: true, hotkeys: true}
   end
 
   def action_items
@@ -171,32 +173,32 @@ class Admin::BaseController < ::InheritedResources::Base
   def add_breadcrumbs
     @breadcrumbs = []
     if parent?
-      @breadcrumbs << {:name => parent_class.model_name.human(:count => 9), :url => parent_collection_path}
-      @breadcrumbs << {:name => AbAdmin.display_name(parent), :url => parent_path}
+      @breadcrumbs << {name: parent_class.model_name.human(count: 9), url: parent_collection_path}
+      @breadcrumbs << {name: AbAdmin.display_name(parent), url: parent_path}
     end
-    @breadcrumbs << {:name => resource_class.model_name.human(:count => 9), :url => collection_path}
-    if params[:id]
-      @breadcrumbs << {:name => AbAdmin.display_name(resource), :url => resource_path}
+    @breadcrumbs << {name: resource_class.model_name.human(count: 9), url: collection_path}
+    if params[:id] && resource.persisted?
+      @breadcrumbs << {name: AbAdmin.display_name(resource), url: resource_path}
     end
   end
 
   def parent_collection_path
-    {:action => :index, :controller => "admin/#{parent_class.model_name.plural}"}
+    {action: :index, controller: "admin/#{parent_class.model_name.plural}"}
   end
 
   def tree_node_renderer
-    @tree_node_renderer ||= lambda { |r| link_to AbAdmin.display_name(r), resource_path(r), :class => 'tree-item_link' }
+    @tree_node_renderer ||= lambda { |r| link_to AbAdmin.display_name(r), resource_path(r), class: 'tree-item_link' }
   end
 
   def search_collection
     params[:q] ||= {}
     params[:q][:s] ||= 'id desc'
     @search = end_of_association_chain.accessible_by(current_ability).admin.ransack(params[:q].no_blank)
-    @search.result(:distinct => true)
+    @search.result(distinct: true)
   end
 
   def collection
-    @collection ||= search_collection.paginate(:page => params[:page], :per_page => per_page, :large => true)
+    @collection ||= search_collection.paginate(page: params[:page], per_page: per_page, large: true)
   end
 
   def per_page
@@ -222,13 +224,13 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def redirect_to_on_success
     if params[:_add_another]
-      new_resource_path(:return_to => params[:return_to])
+      new_resource_path(return_to: params[:return_to])
     elsif params[:_add_edit]
-      edit_resource_path(resource, :return_to => params[:return_to])
+      edit_resource_path(resource, return_to: params[:return_to])
     elsif params[:_add_edit_next] || params[:_add_edit_prev]
       rec = resource.next_prev_by_url(end_of_association_chain.accessible_by(current_ability).unscoped.base, params[:return_to], !!params[:_add_edit_prev])
       if rec
-        edit_resource_path(rec, :return_to => params[:return_to])
+        edit_resource_path(rec, return_to: params[:return_to])
       else
         back_or_collection
       end
@@ -276,7 +278,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def as_role
-    {:as => fetch_role}
+    {as: fetch_role}
   end
 
   def get_role
@@ -298,7 +300,7 @@ class Admin::BaseController < ::InheritedResources::Base
     Rails.logger.debug "Access denied on #{exception.action} #{exception.subject.inspect}, user: #{current_user.try(:id)}"
 
     respond_to do |format|
-      format.html { redirect_to (moderator? ? admin_root_path : root_path), :alert => exception.message }
+      format.html { redirect_to (moderator? ? admin_root_path : root_path), alert: exception.message }
       format.any { head :unauthorized }
     end
   end

data/app/controllers/admin/locators_controller.rb

@@ -1,20 +1,20 @@
 class ::Admin::LocatorsController < ::Admin::BaseController
   authorize_resource
 
-  before_filter :find_files, :only => [:show, :edit, :update]
-  before_filter :find_file, :only => [:edit, :update]
+  before_filter :find_files, only: [:show, :edit, :update]
+  before_filter :find_file, only: [:edit, :update]
 
   def edit
     @locale_hash = YAML.load_file(@file)
   end
 
   def update
-    if Locator.save(@file, {params[:edit_locale_name] => params[:locale]})
+    if Locator.save(@file, {params[:edit_locale_name] => params[:locale_hash]})
       flash[:notice] = I18n.t('flash.admin.locators.updated')
       redirect_to admin_locators_path
     else
       flash[:error] = I18n.t('flash.admin.locators.update_error')
-      redirect_to edit_admin_locators_path(:filename => params[:filename])
+      redirect_to edit_admin_locators_path(filename: params[:filename])
     end
   end
 
@@ -32,6 +32,7 @@ class ::Admin::LocatorsController < ::Admin::BaseController
 
   def reload
     I18n.reload!
+    Locator.reload_checker.expire
     flash[:notice] = I18n.t('flash.admin.locators.restart')
     redirect_to admin_locators_path
   end