ab_admin 0.3.5 → 0.3.6

data/lib/ab_admin/controllers/head_options.rb

@@ -26,6 +26,7 @@ module AbAdmin
 
           page_title.flatten.compact.uniq.join(options[:splitter])
         end
+        @page_title = [I18n.t('page.page_title', page: options[:page]), @page_title].join(options[:splitter]) if options[:page]
         @page_description = [I18n.t('page.prefix'), @page_description].compact.join(' - ')
       end
 

data/lib/ab_admin/core_ext/string.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 class String
-  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\)/
-  LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\s)/
+  # http://lucene.apache.org/core/old_versioned_docs/versions/2_9_1/queryparsersyntax.html
+  LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\)/
+  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\s)/
   KEYBOARDS = {
       en: 'qwertyuiop[]asdfghjkl;\'zxcvbnm,./',
       ru: 'йцукенгшщзхъфывапролджэячсмитьбю/'

data/lib/ab_admin/hooks/paginate_hooks.rb

@@ -52,6 +52,7 @@ module WillPaginate
   end
 end
 
+WillPaginate::ViewHelpers.pagination_options[:no_uri] = false
 WillPaginate::ActionView::LinkRenderer.class_exec do
   def url(page)
     @base_url_params ||= begin

data/lib/ab_admin/models/asset.rb

@@ -46,6 +46,10 @@ module AbAdmin
         I18n.l(created_at, format: '%d.%m.%Y %H:%M')
       end
 
+      def human_name
+        original_name.presence || data_file_name
+      end
+
       def as_json(options = nil)
         options = {
             only: [:id, :guid, :assetable_id, :assetable_type, :user_id,

data/lib/ab_admin/models/attachment_file.rb

@@ -12,10 +12,6 @@ module AbAdmin
         MIME::Type.new(data_content_type).try(:sub_type).gsub('.', '_')
       end
 
-      def human_name
-        original_name.presence || data_file_name
-      end
-
       def human_filesize
         number_to_human_size(data_file_size)
       end

data/lib/ab_admin/models/type_model.rb

@@ -26,9 +26,19 @@ module AbAdmin
       end
 
       def self.legal?(value)
+        ActiveSupport::Deprecation.warn('legal? id deprecated, use valid? instead')
         all.map(&:id).include?(value)
       end
 
+      def self.valid?(c_id)
+        all.map(&:id).include?(c_id.to_i)
+      end
+
+      def self.valid_code?(code)
+        return unless code
+        codes.include?(code.to_sym)
+      end
+
     end
   end
 end

data/lib/ab_admin/models/user.rb

@@ -110,7 +110,7 @@ module AbAdmin
       end
 
       def check_role
-        errors.add(:user_role_id, :invalid) unless ::UserRoleType.legal?(user_role_id)
+        errors.add(:user_role_id, :invalid) unless ::UserRoleType.valid?(user_role_id)
       end
 
     end

data/lib/ab_admin/utils.rb

@@ -49,6 +49,8 @@ module AbAdmin
       locale == I18n.default_locale ? '' : "/#{locale}"
     end
 
+    alias :locale_path :l_path
+
     def rss_text(raw_html)
       Rack::Utils.escape_html(raw_html.no_html.squish)
     end

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -23,6 +23,7 @@ module AbAdmin
 
       def admin_editable(item, attr, options=nil)
         options = {} unless options.is_a?(Hash)
+        options[:type] ||= 'select' if options[:source]
         options[:type] ||= case attr.to_s
                              when /_at$/
                                'date'
@@ -35,11 +36,15 @@ module AbAdmin
                            end
         options[:source] ||= {'true' => 'yes', 'false' => 'no'} if options[:type] == 'select'
         data = {
-            type: options[:type], source: options[:source].try(:to_json),
-            model: resource_class.model_name.singular, url: resource_path(item),
-            name: attr, value: options[:value] || item[attr]
+            type: options[:type],
+            source: options[:source].try(:to_json),
+            model: resource_class.model_name.singular,
+            url: resource_path(item),
+            name: attr,
+            value: options[:value] || item[attr],
+            title: options[:title] || item[attr]
         }
-        link_to admin_pretty_data(item[attr].to_s).html_safe, '#', class: 'editable', data: data
+        link_to admin_pretty_data(data[:title].to_s).html_safe, '#', class: 'editable', data: data
       end
 
       def options_for_ckeditor(options = {})
@@ -102,8 +107,11 @@ module AbAdmin
         image = item.send(options[:assoc])
         return nil unless image
         version = options[:version] || image.class.thumb_size
-        popover_data = {content: "<img class='image_link_popover popover_#{options[:assoc]}' src='#{image.url}'></img>", title: item.name}
-        link_to image_tag(image.url(version)), options[:url], data: popover_data, rel: 'popover', remote: options[:remote]
+        popover_data = {content: "<img class='image_link_popover popover_#{options[:assoc]}' src='#{image.url}'></img>", title: AbAdmin.display_name(item)}
+
+        html_options = options.delete(:html_options) || {}
+        html_options.reverse_merge!(rel: 'popover', remote: options[:remote], data: popover_data)
+        link_to image_tag(image.url(version)), options[:url], html_options
       end
 
       def item_image(item, assoc=:photo, size=:thumb)

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -176,12 +176,14 @@ module AbAdmin
       end
 
       def auto_edit_link(rec, opts = {})
-        return if !rec || cannot?(:edit, rec)
+        return opts[:missing] unless rec
+        return if cannot?(:edit, rec)
         admin_edit_link(rec, opts)
       end
 
       def auto_show_link(rec, opts = {})
-        return if !rec || cannot?(:read, rec)
+        return opts[:missing] unless rec
+        return if cannot?(:read, rec)
         admin_show_link(rec, opts)
       end
 

data/lib/ab_admin/views/form_builder.rb

@@ -42,6 +42,9 @@ module AbAdmin
               end
               return association(attribute_name, options.merge(as: :select))
             end
+          when :checkbox_tree
+            reflection = object.class.reflect_on_association(attribute_name)
+            return template.render 'admin/shared/inputs/checkbox_tree', attribute_name: attribute_name, reflection: reflection, f: self
         end
 
         attribute_name = "#{attribute_name}_#{options[:locale]}" if options[:locale]
@@ -85,8 +88,8 @@ module AbAdmin
           </div>
           #{template.capture(&block) if block_given?}
           <div class="controls"><div id="#{prefix}_map" class="admin_map thumbnail"></div></div>
-          #{template.init_js(js)}
         </div>
+        #{template.init_js(js)}
         HTML
       end
 
@@ -121,7 +124,7 @@ module AbAdmin
         elsif options[:video]
           script_options['allowedExtensions'] ||= %w(mp4 flv)
           script_options['template_id'] = '#fileupload_vtmpl'
-          options[:asset_template] = 'video_file'
+          options[:asset_template] = 'video'
         end
         script_options['allowedExtensions'] ||= %w(jpg jpeg png gif)
         script_options['multiple'] ||= object.fileupload_multiple?(attribute_name)

data/lib/ab_admin/views/helpers.rb

@@ -2,6 +2,10 @@ module AbAdmin
   module Views
     module Helpers
 
+      def pjax?
+        request.headers['X-PJAX']
+      end
+
       def admin?
         user_signed_in? && current_user.admin?
       end

data/lib/ab_admin/views/inputs/ckeditor_input.rb

@@ -4,7 +4,6 @@ module AbAdmin
       class CkeditorInput < ::SimpleForm::Inputs::Base
         def input
           unless @builder.template.instance_variable_get(:@ckeditor_init)
-            #concat template.javascript_include_tag("/assets/ckeditor/init")
             @builder.template.concat @builder.template.javascript_include_tag('/javascripts/ckeditor/init')
             @builder.template.instance_variable_set(:@ckeditor_init, true)
           end

data/lib/generators/ab_admin/install/templates/config/nginx.conf

@@ -44,14 +44,14 @@ server {
 
   root <%= app_path %>/public;
 
-#  if (-f $document_root/maintenance.html) {
-#    rewrite  ^(.*)$  /maintenance.html last;
-#    break;
-#  }
+  #  if (-f $document_root/maintenance.html) {
+  #    rewrite  ^(.*)$  /maintenance.html last;
+  #    break;
+  #  }
 
-#  if ($host != 'www.<%= app_name %>.com' ) {
-#     rewrite  ^/(.*)$  http://www.<%= app_name %>.com/$1  permanent;
-#  }
+  #  if ($host != 'www.<%= app_name %>.com' ) {
+  #     rewrite  ^/(.*)$  http://www.<%= app_name %>.com/$1  permanent;
+  #  }
 
   location ~ ^/uploads|ckeditor_assets|images|javascripts|stylesheets|static/ {
     expires max;
@@ -64,6 +64,11 @@ server {
   }
 
   location ~ ^/assets/ {
+    #  Uncomment for non GET requests on /assets path
+    #  if ($request_method != GET) {
+    #    proxy_pass http://<%= app_name %>_upstream;
+    #    break;
+    #  }
     gzip_static on; # to serve pre-gzipped version
     expires max;
     add_header Cache-Control public;

data/lib/generators/ab_admin/install/templates/models/structure.rb

@@ -4,7 +4,8 @@ class Structure < ActiveRecord::Base
   attr_accessible :kind, :position, :parent_id, :title, :redirect_url, :is_visible,
                   :structure_type, :position_type, :slug, :parent
 
-  has_one :picture, as: :assetable, dependent: :destroy
+  has_one :picture, as: :assetable, dependent: :destroy, conditions: {is_main: true}
+  has_many :pictures, as: :assetable, dependent: :destroy, conditions: {is_main: false}
 
   fileuploads :picture
   translates :title, :redirect_url

data/lib/generators/ab_admin/resource/templates/_form.haml.erb

@@ -43,7 +43,7 @@
    end
 -%>
 = admin_form_for @<%= singular_name %> do |f|
-<% if model.translates? -%>
+<% if model.respond_to?(:translates?) && model.translates? -%>
   = f.locale_tabs do |l|
 <% model.translated_columns_hash.each do |key, col| -%>
     <%= input_by_col_loc(key, col) %>

data/lib/generators/ab_admin/resource/templates/_form.slim.erb

@@ -43,7 +43,7 @@
    end
 -%>
 = admin_form_for @<%= singular_name %> do |f|
-<% if model.translates? -%>
+<% if model.respond_to?(:translates?) && model.translates? -%>
   = f.locale_tabs do |l|
 <% model.translated_columns_hash.each do |key, col| -%>
     <%= input_by_col_loc(key, col) %>

metadata

@@ -2,14 +2,14 @@
 name: ab_admin
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     none: false
   prerelease: false
   name: inherited_resources
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -571,22 +571,6 @@ dependencies:
         version: '0'
     none: false
   type: :development
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :development
 description: Simple and real-life tested Rails::Engine admin interface
 email:
 - leschenko.al@gmail.com
@@ -639,6 +623,7 @@ files:
 - app/assets/javascripts/ab_admin/core/search_form.js.coffee
 - app/assets/javascripts/ab_admin/core/ui_utils.js.coffee
 - app/assets/javascripts/ab_admin/core/utils.js.coffee
+- app/assets/javascripts/ab_admin/core/view_layout.js.coffee
 - app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee
 - app/assets/javascripts/ab_admin/main.js
 - app/assets/javascripts/i18n/translations.js
@@ -657,6 +642,7 @@ files:
 - app/assets/stylesheets/ab_admin/components/_table_view.css.scss
 - app/assets/stylesheets/ab_admin/components/_text_styles.css.scss
 - app/assets/stylesheets/ab_admin/components/_translations.css.scss
+- app/assets/stylesheets/ab_admin/components/_view_layout.css.scss
 - app/assets/stylesheets/ab_admin/devise.css.scss
 - app/assets/stylesheets/ab_admin/fileupload.css.scss
 - app/assets/stylesheets/ab_admin/main.css.scss
@@ -699,6 +685,8 @@ files:
 - app/views/admin/fileupload/_file.html.slim
 - app/views/admin/fileupload/_ftmpl.html.slim
 - app/views/admin/fileupload/_tmpl.html.slim
+- app/views/admin/fileupload/_video.html.slim
+- app/views/admin/fileupload/_vtmpl.html.slim
 - app/views/admin/headers/_form.html.slim
 - app/views/admin/locators/edit.html.slim
 - app/views/admin/locators/show.html.slim
@@ -711,8 +699,10 @@ files:
 - app/views/admin/shared/_breadcrumbs.html.slim
 - app/views/admin/shared/_columns_hider.html.slim
 - app/views/admin/shared/_flash.html.slim
+- app/views/admin/shared/_flash.js.erb
 - app/views/admin/shared/_locale_tabs.html.slim
 - app/views/admin/shared/_save_buttons.html.slim
+- app/views/admin/shared/inputs/_checkbox_tree.html.slim
 - app/views/admin/static_pages/_form.html.slim
 - app/views/admin/structures/_form.html.slim
 - app/views/admin/users/_form.html.slim
@@ -1081,7 +1071,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4208234598639910796
+      hash: 218612203791956818
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -1090,7 +1080,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4208234598639910796
+      hash: 218612203791956818
   none: false
 requirements: []
 rubyforge_project: