edgarj 4.06.00 → 4.06.01
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/edgarj/edgarj_controller.rb +3 -4
- data/app/helpers/edgarj/search_helper.rb +1 -1
- data/app/models/edgarj/search_form.rb +0 -1
- data/app/models/edgarj/sssn.rb +1 -1
- data/lib/core_ext/resources.rb +2 -2
- data/lib/edgarj/version.rb +1 -1
- data/test/dummy/config/environments/production.rb +1 -1
- data/test/dummy/config/environments/test.rb +3 -1
- data/test/dummy/test/controllers/authors_controller_test.rb +2 -2
- data/test/dummy/test/controllers/books_controller_test.rb +2 -2
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b4d49d818fd8326ff35a0da5d5036dcca9255399613e660d4c5ee76f53863ca9
|
4
|
+
data.tar.gz: 96e70872c5bb309bfd82776cd224673247c9c72d65bfebef7cc9df1911786bf3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2798dd82088ecc2e8d3cfb7dea18a4c1d773ac780f286f4420a815885628f26bc81f6e1fd93b7315c7f9903625b088a6fb6f55ac8c7f2360fc0f531f76a2063a
|
7
|
+
data.tar.gz: efd74db87b1a30c8f563c942e114412473316c58a463c7f5b8acb91b2d64265b83980e27fe3924861077023a7b0197c64e76b74b0397eac601979cef2caa0a80
|
@@ -258,15 +258,15 @@ module Edgarj
|
|
258
258
|
# ModelPermission::READ on this controller is required.
|
259
259
|
#
|
260
260
|
def search_save
|
261
|
-
|
262
|
-
|
261
|
+
SavedVcontext.save(current_user, nil,
|
262
|
+
params[:saved_page_info_name], page_info)
|
263
263
|
|
264
264
|
render :update do |page|
|
265
265
|
page << "Edgarj.SearchSavePopup.close();"
|
266
266
|
page.replace 'edgarj_load_condition_menu',
|
267
267
|
:partial=>'edgarj/load_condition_menu'
|
268
268
|
end
|
269
|
-
rescue ActiveRecord::ActiveRecordError
|
269
|
+
rescue ActiveRecord::ActiveRecordError
|
270
270
|
app_rescue
|
271
271
|
render :update do |page|
|
272
272
|
page.replace_html 'search_save_popup_flash_error', :text=>t('save_fail')
|
@@ -332,7 +332,6 @@ module Edgarj
|
|
332
332
|
Time.now.strftime("%Y%m%d-%H%M%S"))
|
333
333
|
file = Tempfile.new(filename, Settings.edgarj.csv_dir)
|
334
334
|
csv_visitor = EdgarjHelper::CsvVisitor.new(view_context)
|
335
|
-
cond = {:conditions=>page_info.record.conditions}
|
336
335
|
file.write CSV.generate_line(model.columns.map{|c| c.name})
|
337
336
|
for rec in user_scoped.where(page_info.record.conditions).
|
338
337
|
order(
|
data/app/models/edgarj/sssn.rb
CHANGED
data/lib/core_ext/resources.rb
CHANGED
@@ -20,7 +20,7 @@ module ActionDispatch::Routing::Mapper::Resources
|
|
20
20
|
# Where, :id is internally used for session so that client application
|
21
21
|
# doesn't have to take care it.
|
22
22
|
def edgarj_resources(*symbols, &block)
|
23
|
-
resources
|
23
|
+
resources(*symbols) do
|
24
24
|
yield if block_given?
|
25
25
|
|
26
26
|
collection do
|
@@ -59,7 +59,7 @@ module ActionDispatch::Routing::Mapper::Resources
|
|
59
59
|
# Where, :id is internally used for session so that client application
|
60
60
|
# doesn't have to take care it.
|
61
61
|
def edgarj_popup_resources(*symbols, &block)
|
62
|
-
resources
|
62
|
+
resources(*symbols, only: [:index]) do
|
63
63
|
yield if block_given?
|
64
64
|
|
65
65
|
collection do
|
data/lib/edgarj/version.rb
CHANGED
@@ -20,7 +20,7 @@ Dummy::Application.configure do
|
|
20
20
|
# config.action_dispatch.rack_cache = true
|
21
21
|
|
22
22
|
# Disable Rails's static asset server (Apache or nginx will already do this).
|
23
|
-
config.
|
23
|
+
config.serve_static_files = false
|
24
24
|
|
25
25
|
# Compress JavaScripts and CSS.
|
26
26
|
config.assets.js_compressor = :uglifier
|
@@ -1,4 +1,6 @@
|
|
1
1
|
Dummy::Application.configure do
|
2
|
+
config.active_support.test_order = :sorted
|
3
|
+
|
2
4
|
# Settings specified here will take precedence over those in config/application.rb.
|
3
5
|
|
4
6
|
# The test environment is used exclusively to run your application's
|
@@ -13,7 +15,7 @@ Dummy::Application.configure do
|
|
13
15
|
config.eager_load = false
|
14
16
|
|
15
17
|
# Configure static asset server for tests with Cache-Control for performance.
|
16
|
-
config.
|
18
|
+
config.serve_static_files = true
|
17
19
|
config.static_cache_control = "public, max-age=3600"
|
18
20
|
|
19
21
|
# Show full error reports and disable caching.
|
@@ -107,8 +107,8 @@ class AuthorsControllerTest < ActionController::TestCase
|
|
107
107
|
end
|
108
108
|
|
109
109
|
should 'search with operator' do
|
110
|
-
xhr :get, :search, edgarj_search_form: {
|
111
|
-
|
110
|
+
xhr :get, :search, edgarj_search_form: {
|
111
|
+
_id: @author.id,
|
112
112
|
edgarj_search_form_operator: {
|
113
113
|
_id: '<>'
|
114
114
|
}
|
@@ -107,8 +107,8 @@ class BooksControllerTest < ActionController::TestCase
|
|
107
107
|
end
|
108
108
|
|
109
109
|
should 'search with operator' do
|
110
|
-
xhr :get, :search, edgarj_search_form: {
|
111
|
-
|
110
|
+
xhr :get, :search, edgarj_search_form: {
|
111
|
+
_id: @book.id,
|
112
112
|
edgarj_search_form_operator: {
|
113
113
|
_id: '<>'
|
114
114
|
}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: edgarj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.06.
|
4
|
+
version: 4.06.01
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fuminori Ido
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-09-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
359
359
|
version: '0'
|
360
360
|
requirements: []
|
361
361
|
rubyforge_project:
|
362
|
-
rubygems_version: 2.7.
|
362
|
+
rubygems_version: 2.7.6
|
363
363
|
signing_key:
|
364
364
|
specification_version: 4
|
365
365
|
summary: Scaffold with Ajax, search, sort, 'belongs_to' popup, and more.
|