enju_leaf 1.1.0.rc17 → 1.1.0.rc18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +1 -1
- data/app/controllers/user_export_files_controller.rb +4 -3
- data/app/controllers/user_groups_controller.rb +5 -1
- data/app/controllers/user_import_files_controller.rb +2 -2
- data/app/models/profile.rb +10 -5
- data/app/models/role.rb +2 -2
- data/app/models/user_export_file.rb +16 -11
- data/app/models/user_export_file_transition.rb +4 -4
- data/app/models/user_group.rb +3 -3
- data/app/models/user_has_role.rb +2 -2
- data/app/models/user_import_file.rb +19 -10
- data/app/models/user_import_file_transition.rb +4 -4
- data/app/models/user_import_result.rb +3 -2
- data/app/views/layouts/application.html.erb +1 -1
- data/app/views/my_accounts/_edit_credential.html.erb +1 -1
- data/app/views/page/_menu.html.erb +2 -2
- data/app/views/page/advanced_search.html.erb +12 -0
- data/app/views/user_export_files/show.html.erb +5 -0
- data/app/workers/user_export_file_queue.rb +1 -1
- data/app/workers/user_import_file_queue.rb +1 -1
- data/config/initializers/redis.rb +3 -0
- data/config/locales/simple_form.ja.yml +1 -1
- data/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +5 -0
- data/lib/enju_leaf.rb +5 -6
- data/lib/enju_leaf/calculate_stat.rb +2 -2
- data/lib/enju_leaf/engine.rb +1 -2
- data/lib/enju_leaf/export_file.rb +2 -2
- data/lib/enju_leaf/helper.rb +8 -9
- data/lib/enju_leaf/import_file.rb +8 -8
- data/lib/enju_leaf/user.rb +15 -15
- data/lib/enju_leaf/version.rb +1 -1
- data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +7 -14
- data/lib/generators/enju_leaf/setup/setup_generator.rb +23 -16
- data/spec/controllers/my_accounts_controller_spec.rb +7 -6
- data/spec/controllers/profiles_controller_spec.rb +12 -12
- data/spec/controllers/roles_controller_spec.rb +12 -12
- data/spec/controllers/user_export_files_controller_spec.rb +20 -20
- data/spec/controllers/user_groups_controller_spec.rb +47 -47
- data/spec/controllers/user_import_files_controller_spec.rb +20 -20
- data/spec/controllers/user_import_results_controller_spec.rb +12 -12
- data/spec/dummy/app/controllers/application_controller.rb +1 -1
- data/spec/dummy/config/initializers/devise.rb +1 -1
- data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +5 -0
- data/spec/dummy/db/schema.rb +3 -1
- data/spec/factories/user.rb +4 -4
- data/spec/fixtures/library_groups.yml +27 -22
- data/spec/fixtures/profiles.yml +10 -5
- data/spec/fixtures/roles.yml +2 -2
- data/spec/fixtures/user_export_files.yml +8 -9
- data/spec/fixtures/user_groups.yml +3 -3
- data/spec/fixtures/user_has_roles.yml +2 -2
- data/spec/fixtures/user_import_files.yml +10 -8
- data/spec/fixtures/user_import_results.yml +3 -2
- data/spec/models/profile_spec.rb +25 -0
- data/spec/models/role_spec.rb +2 -2
- data/spec/models/user_export_file_spec.rb +8 -9
- data/spec/models/user_group_spec.rb +3 -3
- data/spec/models/user_has_role_spec.rb +2 -2
- data/spec/models/user_import_file_spec.rb +19 -16
- data/spec/models/user_import_result_spec.rb +3 -2
- data/spec/routing/accounts_spec.rb +2 -2
- data/spec/routing/profiles_routing_spec.rb +7 -7
- data/spec/routing/resource_import_files_routing_spec.rb +4 -4
- data/spec/views/profiles/new.html.erb_spec.rb +2 -2
- metadata +33 -33
- data/app/models/setting.rb +0 -4
- data/lib/generators/enju_leaf/setup/templates/config/application.yml +0 -48
- data/spec/dummy/app/models/setting.rb +0 -4
data/app/models/setting.rb
DELETED
@@ -1,48 +0,0 @@
|
|
1
|
-
defaults: &defaults
|
2
|
-
enju:
|
3
|
-
erms_url:
|
4
|
-
skip_mobile_agents:
|
5
|
-
- ipad
|
6
|
-
|
7
|
-
family_name_first: true
|
8
|
-
max_number_of_results: 500
|
9
|
-
write_search_log_to_file: true
|
10
|
-
csv_charset_conversion: true
|
11
|
-
|
12
|
-
# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
|
13
|
-
#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
|
14
|
-
amazon:
|
15
|
-
aws_hostname: ecs.amazonaws.jp
|
16
|
-
hostname: www.amazon.co.jp
|
17
|
-
access_key_id: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
|
18
|
-
secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
|
19
|
-
bucket: enju_leaf
|
20
|
-
|
21
|
-
# :google, :amazon
|
22
|
-
book_jacket:
|
23
|
-
source: :google
|
24
|
-
unknown_resource:
|
25
|
-
|
26
|
-
# :mozshot, :simpleapi, :heartrails, :thumbalizr
|
27
|
-
screenshot:
|
28
|
-
generator: :mozshot
|
29
|
-
|
30
|
-
uploaded_file:
|
31
|
-
storage: :local
|
32
|
-
|
33
|
-
manifestation:
|
34
|
-
facet:
|
35
|
-
pub_year_range_interval: 10
|
36
|
-
|
37
|
-
news_post:
|
38
|
-
number:
|
39
|
-
top_page: 3
|
40
|
-
|
41
|
-
development:
|
42
|
-
<<: *defaults
|
43
|
-
|
44
|
-
test:
|
45
|
-
<<: *defaults
|
46
|
-
|
47
|
-
production:
|
48
|
-
<<: *defaults
|