ab_admin 0.1.2 → 0.2.0

data/app/controllers/admin/users_controller.rb

@@ -14,6 +14,29 @@ class Admin::UsersController < Admin::BaseController
 
   private
 
+  export do
+    field :login
+    field :email
+    field :first_name
+    field :last_name
+    field :patronymic
+    field(:trust_state) {|r| r.trust_state_type.try(:title) }
+    field(:user_role_id) {|r| r.user_role_type.try(:title) }
+    field :phone
+    field :skype
+    field :birthday
+    field :locale
+    field :time_zone
+    #field(:gender) {|r| r.gender_type.try(:title) }
+    field :sign_in_count
+    field :current_sign_in_at
+    field :last_sign_in_at
+    field :current_sign_in_ip
+    field :last_sign_in_ip
+    field :confirmed_at
+    field :created_at
+  end
+
   def resource_action_items
     [:edit, :destroy, :show, :preview, :activate, :suspend]
   end

data/app/views/admin/fileupload/_asset.html.slim

@@ -0,0 +1,8 @@
+.asset id="asset_#{asset.id}" data-id=asset.id
+  = link_to icon('remove', true), admin_asset_path(asset), remote: true, method: :delete, title: t('admin.delete'), :class => 'del_asset', \
+     data: {confirm: t('admin.delete_confirmation')}
+  .main_image title=t('admin.fileupload.main_image') = icon('home', true)
+  .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
+  .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
+  a.fileupload-file.fancybox href=asset.url rel='fancybox'
+    img src=asset.thumb_url title=asset.filename

data/app/views/admin/fileupload/_container.html.slim

@@ -0,0 +1,10 @@
+= content_tag :div, :id => element_id, :class => css_class, :data => container_data do
+  .fileupload-drop-area
+    span= t('admin.fileupload.drop_here')
+  .fileupload-list.clearfix= render :partial => "admin/fileupload/#{asset_render_template}", :collection => assets
+  .file-types
+    span.fileupload-button
+      button.btn.btn-primary type="button" = t("admin.fileupload.button#{'s' if multiple}")
+    .type-info== "#{file_title}.  #{t('admin.fileupload.max_size')}: <b>#{file_max_size}</b> MB"
+
+= init_js(js)

data/app/views/admin/fileupload/_file.html.slim

@@ -0,0 +1,5 @@
+.asset id="asset_#{file.id}" data-id=file.id
+  a href=file.url target='_blank' = file.original_name
+  span== " (#{file.human_filesize}) - #{l(file.created_at, :format => :long)}"
+  = link_to t('admin.delete'), admin_asset_path(file), remote: true, method: :delete, \
+    class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}

data/app/views/admin/fileupload/_ftmpl.html.slim

@@ -0,0 +1,6 @@
+script#fileupload_ftmpl type="text/x-jquery-tmpl"
+  .asset id="asset_${id}" data-id='${id}'
+    a href='${url}' target='_blank' ${original_name}
+    span  (${human_filesize})
+    = link_to t('admin.delete'), '/admin/assets/${id}', remote: true, method: :delete, title: t('admin.delete'), \
+      class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}

data/app/views/admin/fileupload/_tmpl.html.slim

@@ -0,0 +1,9 @@
+script#fileupload_tmpl type="text/x-jquery-tmpl"
+  .asset id="asset_${id}" data-id='${id}'
+    = link_to icon('remove', true), '/admin/assets/${id}', remote: true, method: :delete, title: t('admin.delete'), :class => 'del_asset', \
+       data: {confirm: t('admin.delete_confirmation')}
+    .main_image title=t('admin.fileupload.main_image') = icon('home', true)
+    .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
+    .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
+    a.fileupload-file.fancybox href='${url}' rel='fancybox'
+      img src='${thumb_url}' title='${filename}'

data/app/views/admin/users/_form.html.slim

@@ -1,3 +1,4 @@
+= load '/private/var/www/hub/ab_admin/lib/ab_admin/views/form_builder.rb'
 = admin_form_for @user do |f|
   = input_set t('admin.form.base') do
     = f.input :email

data/config/locales/en.yml

@@ -100,7 +100,10 @@ en:
       delete: Delete file
       drop_here: Drag and drop files here
       max_size: Max size
-    form: 
+      main_image: Set Main
+      crop: "Crop"
+      rotate: "Rotate"
+    form:
       cancel: Cancel
       save: Save
       save_and_add_another: Save and add new
@@ -137,68 +140,10 @@ en:
       update_file: Update File
       filter: "type text to filter"
       translate_incomplete: "Translate all incomplete (google)"
-    main_image: Set Main
-    max_size: Max posted.
-    navigation: 
+    navigation:
       system: System
       users: Members
     no_results_text: Nothing found
-    permissions: 
-      actions: 
-        create: Create
-        delete: Remove
-        publish: Publish
-        read: Browse
-        update: Edit
-      assocs: 
-        company: company
-      form: 
-        actions: Can
-        add: Add
-        assoc: Through
-        assoc_ids: resource
-        context: "on"
-        destroy: Remove?
-        includes: Related
-        is_own: Only the owner
-        is_visibility: hide unpublished
-        is_work: hide published
-        per_resource: According to one resource
-        resource: Namely
-        resources: Entire resource
-        subject: By Resource
-    perms: 
-      actions: 
-        add_styles: Edit styles
-        create: Create
-        delete: Remove
-        import: Import Manager
-        journalist: Journalist
-        moderator: Moderator
-        publish: Publish
-        publish_social: Publish to Social
-        read: Browse
-        update: Edit
-      assocs: 
-        catalogues: catalogs
-        company: company
-        group: group
-        groups: Group
-      form: 
-        actions: Can
-        add: Add
-        assoc: Through
-        assoc_ids: resource
-        context: "on"
-        destroy: Remove?
-        includes: Related
-        is_own: Only the owner
-        is_visibility: hide unpublished
-        is_work: hide published
-        per_resource: According to one resource
-        resource: Namely
-        resources: Entire resource
-        subject: By Resource
     photo: Main picture
     pictures: Image
     preview: Preview

data/config/locales/ru.yml

@@ -2,7 +2,11 @@
 ru: 
   _no: "Нет"
   _yes: "Да"
-  admin: 
+  activerecord:
+    models:
+      locator: "Переводы"
+      settings: "Настройки"
+  admin:
     actions: 
       activate: 
         link: "Активировать"
@@ -98,8 +102,11 @@ ru:
       buttons: "Выберите файлы"
       delete: "Удалить файл"
       drop_here: "Перетащите файлы сюда"
-      max_size: "Макс. р."
-    form: 
+      main_image: "Сделать главным"
+      max_size: "Макс разм."
+      crop: "Обрезать"
+      rotate: "Повернуть"
+    form:
       cancel: "Отмена"
       save: "Сохранить"
       save_and_add_another: "Сохранить и добавить новый"
@@ -140,68 +147,11 @@ ru:
       key: "Ключ"
       filter: "введите текст для фильтрации"
       translate_incomplete: "Перевести все пустые (google)"
-    main_image: "Сделать главным"
-    max_size: "Макс разм."
-    navigation: 
+    navigation:
       system: "Система"
       users: "Пользователи"
+      dashboard: "Dashboard"
     no_results_text: "Ничего не найдено"
-    permissions: 
-      actions: 
-        create: "Создавать"
-        delete: "Удалять"
-        publish: "Публиковать"
-        read: "Просматривать"
-        update: "Редактировать"
-      assocs: 
-        company: "компанию"
-      form: 
-        actions: "Может"
-        add: "Добавить"
-        assoc: "Через"
-        assoc_ids: "ресурс"
-        context: "на"
-        destroy: "Удалить?"
-        includes: "Относящиеся"
-        is_own: "только как владелец"
-        is_visibility: "скрывать неопубликованные"
-        is_work: "скрывать опубликованные"
-        per_resource: "По единице ресурса"
-        resource: "А именно"
-        resources: "Весь ресурс"
-        subject: "По ресурсу"
-    perms: 
-      actions: 
-        add_styles: "Редактировать стили"
-        create: "Создавать"
-        delete: "Удалять"
-        import: "Импорт менеджер"
-        journalist: "Журналист"
-        moderator: "Модератор"
-        publish: "Публиковать"
-        publish_social: "Публиковать в соц"
-        read: "Просматривать"
-        update: "Редактировать"
-      assocs: 
-        catalogues: "каталоги"
-        company: "компанию"
-        group: "группу"
-        groups: "группы"
-      form: 
-        actions: "Может"
-        add: "Добавить"
-        assoc: "Через"
-        assoc_ids: "ресурс"
-        context: "на"
-        destroy: "Удалить?"
-        includes: "Относящиеся"
-        is_own: "только как владелец"
-        is_visibility: "скрывать неопубликованные"
-        is_work: "скрывать опубликованные"
-        per_resource: "По единице ресурса"
-        resource: "А именно"
-        resources: "Весь ресурс"
-        subject: "По ресурсу"
     photo: "Главное изображение"
     pictures: "Изображения"
     preview: "Предпросмотр"
@@ -274,7 +224,8 @@ ru:
     no_results: "Ничего не найдено"
     search: "Идет поиск..."
     value: "Значение"
-  attributes: 
+  attributes:
+    map: "Местоположение"
     address: "Адрес"
     country: "Страна"
     country_id: "Страна"

data/config/routes.rb

@@ -32,19 +32,22 @@ Rails.application.routes.draw do
     post 'translate' => AbAdmin::I18nTools::TranslateApp
 
     controller 'manager' do
-      scope ':model_name' do
-        get '/', :to => :index, :as => 'index'
-        post '/', :to => :create, :as => 'create'
+      scope '(/:parent_resource/:parent_id)/:model_name' do
         get '/new', :to => :new, :as => 'new'
         post '/batch', :to => :batch, :as => 'batch'
         post '/rebuild', :to => :rebuild, :as => 'rebuild'
+        match '/custom_action', :to => :custom_action, :as => 'collection_action'
 
         scope ':id' do
-          get '/', :to => :show, :as => 'show'
           get '/edit', :to => :edit, :as => 'edit'
+          match '/custom_action', :to => :custom_action, :as => 'member_action'
+          get '/', :to => :show, :as => 'show'
           put '/', :to => :update, :as => 'update'
           delete '/', :to => :destroy, :as => 'destroy'
         end
+
+        get '/', :to => :index, :as => 'index'
+        post '/', :to => :create, :as => 'create'
       end
     end
 

data/features/dsl/custom_actions.feature

@@ -0,0 +1,62 @@
+@dsl @wip
+Feature: Custom actions
+
+  Background:
+    Given I am logged in
+    And 1 product exists
+
+  Scenario: Custom member action
+    Given a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        action_item do
+          link_to 'Custom action', action_item_admin_path(:custom), :method => :post
+        end
+
+        member_action :custom, :method => :post do
+          flash[:notice] = 'Custom action done!'
+          redirect_to resource_path
+        end
+      end
+      """
+    And I am on the admin product page
+    When I click "Custom action"
+    Then I should see "Custom action done!"
+    And I should be on the admin product page
+
+  Scenario: Custom member action http verb check
+    Given a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        action_item do
+          link_to 'Custom action', action_item_admin_path(:custom)
+        end
+
+        member_action :custom, :method => :post do
+          flash[:notice] = 'Custom action done!'
+          redirect_to resource_path
+        end
+      end
+      """
+    And I am on the admin product page
+    When I should see routing error when follow "Custom action"
+
+  Scenario: Custom collection action
+    Given a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        action_item do
+          link_to 'Custom collection action', action_item_admin_path(:custom_collection), :method => :post
+        end
+
+        collection_action :custom_collection, :method => :post do
+          flash[:notice] = 'Custom collection action done!'
+          redirect_to collection_path
+        end
+      end
+      """
+    And I am on the admin products page
+    When I click "Custom collection action"
+    Then I should see "Custom collection action done!"
+    And I should be on the admin products page
+

data/features/dsl/parent_resource.feature

@@ -0,0 +1,18 @@
+@dsl
+Feature: Scope view to parent resource
+
+  Background:
+    Given I am logged in
+
+  Scenario:
+    Given collection "Expensive" with 2 products
+    And a product with sku "sofa-9"
+    And a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        belongs_to :collection, :user
+      end
+      """
+    Then I am on the collection products page
+    And I should see 2 products
+    And I should not see "sofa-9"

data/features/step_definitions/configuration_steps.rb

@@ -75,6 +75,12 @@ Given /^I add "([^"]*)" to the "([^"]*)" model$/ do |code, model_name|
   ActiveSupport::Dependencies.clear
 end
 
+Given /^I should see routing error when follow "([^"]*)"$/ do |link|
+  expect {
+    click_link(link)
+  }.to raise_error(ActionController::RoutingError)
+end
+
 Given /^I should see routing error on (.+)$/ do |page_name|
   expect {
     visit path_to(page_name)

data/features/step_definitions/dsl/parent_resource_steps.rb

@@ -0,0 +1,8 @@
+Given /^collection "(.*?)" with (\d+) products$/ do |collection, num|
+  @collection = FactoryGirl.create(:collection, :name => collection)
+  num.times { FactoryGirl.create(:product, :collection => @collection) }
+end
+
+Then /^I should see (\d+) products$/ do |num|
+  all('#list tbody tr').count.should == num
+end

data/features/step_definitions/settings_steps.rb

@@ -3,5 +3,5 @@ Then /^the "(.*?)" setting should be true$/ do |setting|
 end
 
 Then /^the "(.*?)" setting should be equal "(.*?)"$/ do |setting, value|
-  configatron.to_hash.val(*setting.split('.').map(&:to_sym)).should == YAML.load(value)
+  configatron.to_hash.val(*setting.split('.').map(&:to_sym)).should == YAML.load(value.to_s)
 end

data/features/step_definitions/web_steps/transforms_steps.rb

@@ -0,0 +1,3 @@
+Transform /^(\d+)$/ do |number|
+  number.to_i
+end

data/features/support/paths.rb

@@ -27,6 +27,9 @@ module NavigationHelpers
       when /the admin product page/
         "/admin/products/#{@product.id}"
 
+      when /the collection products page/
+        "/admin/collections/#{@collection.id}/products"
+
       when /the edit admin settings page/
         '/admin/settings/edit'
 

data/lib/ab_admin.rb

@@ -24,6 +24,7 @@ module AbAdmin
     autoload :Field, 'ab_admin/config/base'
     autoload :BatchAction, 'ab_admin/config/base'
     autoload :ActionItem, 'ab_admin/config/base'
+    autoload :CustomAction, 'ab_admin/config/base'
     autoload :OptionalDisplay, 'ab_admin/config/optional_display'
   end
 
@@ -96,6 +97,7 @@ module AbAdmin
   module I18nTools
     autoload :TranslateApp, 'ab_admin/i18n_tools/translate_app'
     autoload :GoogleTranslate, 'ab_admin/i18n_tools/google_translate'
+    autoload :ModelTranslator, 'ab_admin/i18n_tools/model_translator'
   end
 
   module Generators
@@ -125,6 +127,9 @@ module AbAdmin
   mattr_accessor :display_name_methods
   @@display_name_methods = [:title, :name, :full_name]
 
+  mattr_accessor :translate_models
+  @@translate_models = %w(User Asset Structure StaticPage Header AdminComment)
+
   extend Utils
 
   def self.setup