edgarj 4.01.01 → 4.02.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ddef252d6c45d8d47d49ef923bb7a734a11cbf3
-  data.tar.gz: 87e4e805cea5c7cae0135e48ff86afe65325b38f
+  metadata.gz: fb262ae814e088c79954becacd222d8cdc4b3797
+  data.tar.gz: 7fe707418fcedd8a51a40f15100008390ec30829
 SHA512:
-  metadata.gz: 8cf38614211d6563b5e4f425f6e1e4d01f740730ac6062cfeeab3272135bf36301c5910c8f8796c6b0642222ec297645d9bd9750ac274c55eb81d5d12958a1eb
-  data.tar.gz: ce97437c3a271bd022b7aa3005934a908aa503b6fa301baf22ff8b999f25ac7427f73df04ea640b4e12e1f1a495a438becb20fb74c729cf0af983c69621fa308
+  metadata.gz: 5595e58910da9ee716808607d7e28dd435d16d029feb749feb035c0192d8ba350e44a6f09b471508caba00006601506a7767117cea4dbaa1bb76fb3676681476
+  data.tar.gz: e51083e18e3578df94d6691ab653d4ddce11eaf27d0c8601361ff6abe48d0280c36ae27107a6f7a958fb62af38b131acc4ce0e3b14ea289d358a04232e052d6d

data/app/controllers/edgarj/popup_controller.rb

@@ -8,7 +8,7 @@ module Edgarj
     include ControllerMixinCommon
     include Edgarj::PermissionMixin
 
-    helper_method :model, :popup_drawer
+    helper_method :title, :model, :popup_drawer
     before_filter :require_read_permission
 
     # draw popup windows
@@ -16,6 +16,8 @@ module Edgarj
     # === INPUTS
     # params[:id_target]::          id target DOM on click entry of popup
     # params[:page]::               on paginate
+    # params[:title]::              (optional) popup title
+    #                               default: t('edgarj.form.popup.title') % model_label
     #
     # === Paginate logic
     # - params[:page] exists        -> save it to @page_info and use it
@@ -112,6 +114,15 @@ module Edgarj
       @popup_drawer
     end
 
+    # popup window title is used in the following priority:
+    #
+    # 1. params[:title]
+    # 1. this method
+    # 1. t('edgarj.form.popup.title') % model_label
+    def title
+      ''
+    end
+
     # This works as:
     #
     #   before_render :set_popup_drawer

data/app/helpers/edgarj/assoc_helper.rb

@@ -119,15 +119,15 @@ module Edgarj
     end
 =end
 
-    # 1. t('view.CONTROLLER.label.MODEL.COLUMN') if exists.
-    # 1. column I18n is used if exists.
+    # 1. t('view.CONTROLLER.MODEL.COL_NAME')
+    # 1. MODEL.human_attribute_name(COL_NAME)
     # 1. else, parent.human_name is used.
     def draw_belongs_to_label_sub(model, col_name, parent_model)
       @controller_model ||= controller.send(:model)
+
       I18n.t(col_name,
           scope:    "view.#{controller_path}.#{@controller_model.name.underscore}",
-          default:  I18n.t(col_name,
-              scope:    "activerecord.attributes.#{model.to_s.underscore}",
+          default:  model.human_attribute_name(col_name,
               default:  parent_model.human_name))
     end
 

data/app/views/edgarj/popup/index.js.erb

@@ -1,5 +1,4 @@
 $('#edgarj_form_popup').html("<%= j(render 'index') %>");
 $('#edgarj_form_popup').dialog('option', 'title',
-    '<%= t('edgarj.form.popup.title') % model_label %>');
+    '<%= params[:title] || title || t('edgarj.form.popup.title') % model_label %>');
 $('#edgarj_form_popup').dialog('open');
-

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = "4.01.00"
+  VERSION = "4.02.00"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 4.01.01
+  version: 4.02.00
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -364,91 +364,91 @@ signing_key:
 specification_version: 4
 summary: Scaffold with Ajax, search, sort, 'belongs_to' popup, and more.
 test_files:
-- test/models/helpers/edgarj/model_permissions_helper_test.rb
-- test/models/helpers/edgarj/user_group_users_helper_test.rb
-- test/models/edgarj/user_group_user_test.rb
-- test/models/edgarj/sssn_test.rb
-- test/models/edgarj/user_group_test.rb
-- test/models/edgarj/page_info_test.rb
-- test/models/edgarj/model_permission_test.rb
-- test/integration/navigation_test.rb
-- test/support/edgarj/controller_supporter.rb
-- test/controllers/edgarj/user_group_users_controller_test.rb
-- test/controllers/edgarj/edgarj_controller_test.rb
-- test/controllers/edgarj/model_permissions_controller_test.rb
-- test/edgarj_test.rb
-- test/test_helper.rb
+- test/dummy/config.ru
+- test/dummy/test/controllers/books_controller_test.rb
+- test/dummy/test/controllers/authors_controller_test.rb
+- test/dummy/test/controllers/authors_popup_controller_test.rb
 - test/dummy/test/helpers/authors_helper_test.rb
-- test/dummy/test/models/book_test.rb
 - test/dummy/test/models/author_test.rb
 - test/dummy/test/models/rails_config_test.rb
-- test/dummy/test/controllers/authors_controller_test.rb
-- test/dummy/test/controllers/books_controller_test.rb
-- test/dummy/test/controllers/authors_popup_controller_test.rb
-- test/dummy/README.rdoc
-- test/dummy/config.ru
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20131218011851_create_books.rb
-- test/dummy/db/migrate/20140807065420_create_users.rb
-- test/dummy/db/migrate/20140201000000_add_user_group_id_to_authors.rb
-- test/dummy/db/migrate/20131107120635_create_authors.rb
+- test/dummy/test/models/book_test.rb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/javascripts/authors.js
+- test/dummy/app/assets/stylesheets/authors.css
+- test/dummy/app/assets/stylesheets/scaffold.css
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/decorators/models/edgarj/user_group_decorator.rb
+- test/dummy/app/controllers/authors_popup_controller.rb
+- test/dummy/app/controllers/dummy_auth_mixin.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/books_controller.rb
+- test/dummy/app/controllers/authors_controller.rb
+- test/dummy/app/helpers/authors_popup_helper.rb
+- test/dummy/app/helpers/authors_helper.rb
+- test/dummy/app/helpers/books_helper.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/author.rb
+- test/dummy/app/models/user.rb
+- test/dummy/app/models/book.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/login.html.erb
 - test/dummy/Rakefile
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
 - test/dummy/config/database.yml
 - test/dummy/config/settings.yml
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
 - test/dummy/config/settings/production.yml
 - test/dummy/config/settings/development.yml
 - test/dummy/config/settings/test.yml
-- test/dummy/config/edgarj/menu_config.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/application.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/locales/ja.yml
-- test/dummy/config/initializers/config.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/public/favicon.ico
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/config.rb
+- test/dummy/config/edgarj/menu_config.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/public/404.html
-- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
 - test/dummy/public/500.html
-- test/dummy/app/views/layouts/login.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/decorators/models/edgarj/user_group_decorator.rb
-- test/dummy/app/helpers/authors_helper.rb
-- test/dummy/app/helpers/books_helper.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/authors_popup_helper.rb
-- test/dummy/app/models/book.rb
-- test/dummy/app/models/author.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/assets/javascripts/authors.js
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/assets/stylesheets/authors.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/authors_controller.rb
-- test/dummy/app/controllers/books_controller.rb
-- test/dummy/app/controllers/dummy_auth_mixin.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/authors_popup_controller.rb
+- test/dummy/public/422.html
+- test/dummy/README.rdoc
+- test/dummy/bin/bundle
+- test/dummy/bin/rake
+- test/dummy/bin/rails
+- test/dummy/db/schema.rb
+- test/dummy/db/migrate/20140807065420_create_users.rb
+- test/dummy/db/migrate/20131218011851_create_books.rb
+- test/dummy/db/migrate/20131107120635_create_authors.rb
+- test/dummy/db/migrate/20140201000000_add_user_group_id_to_authors.rb
+- test/test_helper.rb
+- test/integration/navigation_test.rb
+- test/controllers/edgarj/user_group_users_controller_test.rb
+- test/controllers/edgarj/edgarj_controller_test.rb
+- test/controllers/edgarj/model_permissions_controller_test.rb
 - test/fixtures/authors.yml
+- test/fixtures/books.yml
 - test/fixtures/users.yml
-- test/fixtures/edgarj/page_infos.yml
 - test/fixtures/edgarj/user_group_users.yml
 - test/fixtures/edgarj/user_groups.yml
-- test/fixtures/edgarj/model_permissions.yml
+- test/fixtures/edgarj/page_infos.yml
 - test/fixtures/edgarj/sssns.yml
-- test/fixtures/books.yml
+- test/fixtures/edgarj/model_permissions.yml
+- test/edgarj_test.rb
+- test/support/edgarj/controller_supporter.rb
+- test/models/helpers/edgarj/model_permissions_helper_test.rb
+- test/models/helpers/edgarj/user_group_users_helper_test.rb
+- test/models/edgarj/user_group_test.rb
+- test/models/edgarj/sssn_test.rb
+- test/models/edgarj/model_permission_test.rb
+- test/models/edgarj/page_info_test.rb
+- test/models/edgarj/user_group_user_test.rb
 has_rdoc: