enju_grid 0.2.0.beta.3 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/manifestations/index.html.erb +40 -21
  3. data/lib/enju_grid/version.rb +1 -1
  4. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +9 -0
  5. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +9 -0
  6. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +9 -0
  7. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +9 -0
  8. data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +6 -0
  9. data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +11 -0
  10. data/spec/views/manifestations/index.html.erb_spec.rb +1 -0
  11. metadata +31 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7d23a8d3bc3a236dafbacfa8dbac6eb73d9c0848
4
- data.tar.gz: 69323b18bef07f8a9be242e7fe6abe19c216fe5f
3
+ metadata.gz: cae056c30a9ef74a709dc37481f49afb3b338f39
4
+ data.tar.gz: 1cdb3adb12e8104e05f58cc24174688e99569b39
5
5
  SHA512:
6
- metadata.gz: d7ab3cf03fcc57d00a2e16c46239239613b0cdf38769a19344cca182c2685a7777688325e2a03490f4f580b5b676638e8a31b955a51775e1630b00f7ff46676d
7
- data.tar.gz: 6b0f886e5c5df5b40705a22b235b51454b81e346c332ea0ef4df1c1f4cad42551a7ca75b769c2ab6f7728238ee49fcb84ccf262f02f23444ae28243ef548e741
6
+ metadata.gz: fc73603f613ec2a9722307359867f4d34adb24f44845ad0878b83efe967fc4cc208e2c96a8dc1785aa3a6037ec2837079f0b226f7c13b81831a5c155d3081e55
7
+ data.tar.gz: 479fc77cf8b6b421bb51ad4503bd09df07e06e2ffaaba4b42f5de934051c18f5b8e693a5426621407f03a38a907c2cbf9cadba8e669b3495655cac442531f2af
data/app/views/manifestations/index.html.erb CHANGED
@@ -35,24 +35,39 @@
35
35
  <%- end -%>
36
36
  </p>
37
37
 
38
- <p>
39
- <%= t('page.sort_by') -%>:
40
- <%- if params[:sort_by].blank? -%>
41
- <strong><%= t('manifestation.date_of_acquisition') -%></strong>
42
- <%- else -%>
43
- <%= link_to t('manifestation.date_of_acquisition'), url_for(params.permit.merge(sort_by: nil, only_path: true)) -%>
44
- <%- end -%>
45
- <%- if params[:sort_by] == 'pub_date' -%>
46
- <strong><%= t('activerecord.attributes.manifestation.date_of_publication') -%></strong>
47
- <%- else -%>
48
- <%= link_to t('activerecord.attributes.manifestation.date_of_publication'), url_for(params.permit.merge(sort_by: 'pub_date', only_path: true)) -%>
49
- <%- end -%>
50
- <%- if params[:sort_by] == 'title' -%>
51
- <strong><%= t('page.title') -%></strong>
52
- <%- else -%>
53
- <%= link_to t('page.title'), url_for(params.permit.merge(sort_by: 'title', only_path: true)) -%>
38
+ <div class="field right">
39
+ <%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
40
+ <p>
41
+ <%= select_tag 'per_page', options_for_select({
42
+ t('page.per_page', num: 10) => 10,
43
+ t('page.per_page', num: 20) => 20,
44
+ t('page.per_page', num: 50) => 50,
45
+ t('page.per_page', num: 100) => 100,
46
+ }, selected: filtered_params[:per_page]) %>
47
+ <%= select_tag 'sort_by', options_for_select({
48
+ [t('page.sort_criteria.created_at'),
49
+ t('page.sort_criteria.date_desc')].join(" : ") => 'created_at:desc',
50
+ [t('page.sort_criteria.created_at'),
51
+ t('page.sort_criteria.date_asc')].join(" : ") => 'created_at:asc',
52
+ [t('activerecord.attributes.manifestation.pub_date'),
53
+ t('page.sort_criteria.date_desc')].join(" : ") => 'pub_date:desc',
54
+ [t('activerecord.attributes.manifestation.pub_date'),
55
+ t('page.sort_criteria.date_asc')].join(" : ") => 'pub_date:asc',
56
+ [t('page.score'),
57
+ t('page.sort_criteria.score_desc')].join(" : ") => 'score:desc',
58
+ [t('page.title'),
59
+ t('page.sort_criteria.title_asc')].join(" : ") => 'title:asc',
60
+ [t('page.title'),
61
+ t('page.sort_criteria.title_desc')].join(" : ") => 'title:desc',
62
+ }, selected: filtered_params[:sort_by] || 'created_at:desc') -%>
63
+ <%= hidden_field_tag 'query', @query -%>
64
+ <% [ :reservable, :carrier_type, :library, :language, :pub_year ].each do |p| -%>
65
+ <%= hidden_field_tag p, filtered_params[p] if filtered_params[p] -%>
66
+ <% end -%>
67
+ <%= submit_tag t('page.show') -%><br />
68
+ </p>
54
69
  <%- end -%>
55
- </p>
70
+ </div>
56
71
 
57
72
  <div class="autopagerize_page_element" id="list">
58
73
  <table class="table table-striped index" id="manifestation_list">
@@ -82,12 +97,15 @@
82
97
  </div>
83
98
  <% end %>
84
99
  <%- else -%>
85
- <!-- TODO: 検索結果が少ない場合にも表示させる -->
86
- <%= render 'manifestations/not_found' -%>
87
- <%- end -%>
100
+ <%- if @parent -%>
101
+ <p><%= t('manifestation.record_not_added') %></p>
102
+ <%- else -%>
103
+ <!-- TODO: 検索結果が少ない場合にも表示させる -->
104
+ <%= render 'manifestations/not_found' -%>
105
+ <%- end -%>
88
106
 
89
107
  <div class="autopagerize_insert_before"></div>
90
-
108
+ <%- end -%>
91
109
  </div>
92
110
  </div>
93
111
 
@@ -106,6 +124,7 @@
106
124
  <%= link_to((image_tag 'icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(params.permit.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.permit.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
107
125
  <%- end -%>
108
126
  </div>
127
+ <%= render 'manifestations/export_list' %>
109
128
  </div>
110
129
 
111
130
  <% if defined?(EnjuBookmark) %>
data/lib/enju_grid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuGrid
2
- VERSION = "0.2.0.beta.3"
2
+ VERSION = "0.2.0"
3
3
  end
data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb ADDED
@@ -0,0 +1,9 @@
1
+ class AddMostRecentToImportRequestTransitions < ActiveRecord::Migration
2
+ def up
3
+ add_column :import_request_transitions, :most_recent, :boolean, null: true
4
+ end
5
+
6
+ def down
7
+ remove_column :import_request_transitions, :most_recent
8
+ end
9
+ end
data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb ADDED
@@ -0,0 +1,9 @@
1
+ class AddMostRecentToResourceImportFileTransitions < ActiveRecord::Migration
2
+ def up
3
+ add_column :resource_import_file_transitions, :most_recent, :boolean, null: true
4
+ end
5
+
6
+ def down
7
+ remove_column :resource_import_file_transitions, :most_recent
8
+ end
9
+ end
data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb ADDED
@@ -0,0 +1,9 @@
1
+ class AddMostRecentToResourceExportFileTransitions < ActiveRecord::Migration
2
+ def up
3
+ add_column :resource_export_file_transitions, :most_recent, :boolean, null: true
4
+ end
5
+
6
+ def down
7
+ remove_column :resource_export_file_transitions, :most_recent
8
+ end
9
+ end
data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb ADDED
@@ -0,0 +1,9 @@
1
+ class AddMostRecentToAgentImportFileTransitions < ActiveRecord::Migration
2
+ def up
3
+ add_column :agent_import_file_transitions, :most_recent, :boolean, null: true
4
+ end
5
+
6
+ def down
7
+ remove_column :agent_import_file_transitions, :most_recent
8
+ end
9
+ end
data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb ADDED
@@ -0,0 +1,6 @@
1
+ class AddPictureWidthToPictureFile < ActiveRecord::Migration
2
+ def change
3
+ add_column :picture_files, :picture_width, :integer
4
+ add_column :picture_files, :picture_height, :integer
5
+ end
6
+ end
data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb ADDED
@@ -0,0 +1,11 @@
1
+ class AddAttachmentAttachmentToCarrierTypes < ActiveRecord::Migration
2
+ def self.up
3
+ change_table :carrier_types do |t|
4
+ t.attachment :attachment
5
+ end
6
+ end
7
+
8
+ def self.down
9
+ remove_attachment :carrier_types, :attachment
10
+ end
11
+ end
data/spec/views/manifestations/index.html.erb_spec.rb CHANGED
@@ -16,6 +16,7 @@ describe "manifestations/index" do
16
16
  @max_number_of_results = 500
17
17
  @library_group = LibraryGroup.first
18
18
  view.stub(:params).and_return(ActionController::Parameters.new)
19
+ view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50).permit(:per_page))
19
20
  end
20
21
 
21
22
  it "renders attributes in <p>" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0.beta.3
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masao Takaku
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-16 00:00:00.000000000 Z
11
+ date: 2017-09-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -16,84 +16,84 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.2.0.beta.3
19
+ version: 0.2.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.2.0.beta.3
26
+ version: 0.2.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: enju_leaf
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2.0.beta.3
33
+ version: 1.2.0
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2.0.beta.3
40
+ version: 1.2.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: enju_manifestation_viewer
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.2.0.beta.2
47
+ version: 0.2.0
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.2.0.beta.2
54
+ version: 0.2.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: enju_circulation
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.2.0.beta.2
61
+ version: 0.2.0
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.2.0.beta.2
68
+ version: 0.2.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: enju_subject
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.2.0.beta.3
75
+ version: 0.2.0
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.2.0.beta.3
82
+ version: 0.2.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: globalize
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 5.0.1
89
+ version: 5.1.0.beta1
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 5.0.1
96
+ version: 5.1.0.beta1
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: globalize-accessors
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: '3.4'
159
+ version: '3.5'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: '3.4'
166
+ version: '3.5'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: simplecov
169
169
  requirement: !ruby/object:Gem::Requirement
@@ -509,6 +509,11 @@ files:
509
509
  - spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb
510
510
  - spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb
511
511
  - spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb
512
+ - spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb
513
+ - spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb
514
+ - spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb
515
+ - spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb
516
+ - spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb
512
517
  - spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb
513
518
  - spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
514
519
  - spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
@@ -516,6 +521,7 @@ files:
516
521
  - spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
517
522
  - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
518
523
  - spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
524
+ - spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
519
525
  - spec/dummy/db/schema.rb
520
526
  - spec/dummy/public/404.html
521
527
  - spec/dummy/public/422.html
@@ -627,12 +633,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
627
633
  version: '0'
628
634
  required_rubygems_version: !ruby/object:Gem::Requirement
629
635
  requirements:
630
- - - ">"
636
+ - - ">="
631
637
  - !ruby/object:Gem::Version
632
- version: 1.3.1
638
+ version: '0'
633
639
  requirements: []
634
640
  rubyforge_project:
635
- rubygems_version: 2.6.6
641
+ rubygems_version: 2.6.13
636
642
  signing_key:
637
643
  specification_version: 4
638
644
  summary: Next-L Enju Grid
@@ -742,6 +748,7 @@ test_files:
742
748
  - spec/dummy/config/initializers/devise.rb
743
749
  - spec/dummy/script/rails
744
750
  - spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb
751
+ - spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb
745
752
  - spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb
746
753
  - spec/dummy/db/migrate/127_create_use_restrictions.rb
747
754
  - spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb
@@ -785,6 +792,7 @@ test_files:
785
792
  - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
786
793
  - spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb
787
794
  - spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb
795
+ - spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
788
796
  - spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
789
797
  - spec/dummy/db/migrate/20150925092505_add_label_to_classification.rb
790
798
  - spec/dummy/db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb
@@ -870,6 +878,7 @@ test_files:
870
878
  - spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb
871
879
  - spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb
872
880
  - spec/dummy/db/migrate/20090720091429_create_content_types.rb
881
+ - spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb
873
882
  - spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
874
883
  - spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb
875
884
  - spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb
@@ -922,6 +931,7 @@ test_files:
922
931
  - spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb
923
932
  - spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb
924
933
  - spec/dummy/db/migrate/131_create_request_types.rb
934
+ - spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb
925
935
  - spec/dummy/db/migrate/20120319173203_create_accepts.rb
926
936
  - spec/dummy/db/migrate/20081023092436_create_search_engines.rb
927
937
  - spec/dummy/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb
@@ -941,6 +951,7 @@ test_files:
941
951
  - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
942
952
  - spec/dummy/db/migrate/077_create_user_groups.rb
943
953
  - spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb
954
+ - spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb
944
955
  - spec/dummy/db/migrate/20130506175303_create_identifier_types.rb
945
956
  - spec/dummy/db/migrate/20150924115059_create_withdraws.rb
946
957
  - spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb
@@ -951,6 +962,7 @@ test_files:
951
962
  - spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb
952
963
  - spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb
953
964
  - spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
965
+ - spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb
954
966
  - spec/dummy/db/migrate/20081212151614_create_bookmark_stats.rb
955
967
  - spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb
956
968
  - spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb