enju_flower 0.1.0.pre19 → 0.1.0.pre20
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/manifestations_helper.rb +1 -1
- data/app/views/manifestations/_index_form_parent.html.erb +1 -1
- data/app/views/manifestations/_manifestation.html.erb +3 -3
- data/app/views/manifestations/_show_detail_librarian.html.erb +1 -1
- data/app/views/manifestations/_show_detail_user.html.erb +1 -1
- data/app/views/manifestations/_show_index.html.erb +1 -1
- data/app/views/manifestations/_show_index.mobile.erb +2 -2
- data/app/views/manifestations/_show_series_index.html.erb +1 -1
- data/app/views/manifestations/_title.html.erb +1 -1
- data/lib/enju_flower/version.rb +1 -1
- data/spec/dummy/app/controllers/application_controller.rb +1 -0
- data/spec/dummy/config/application.rb +1 -0
- data/spec/dummy/config/boot.rb +2 -2
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/005_create_manifestations.rb +0 -1
- data/spec/dummy/db/migrate/029_create_subjects.rb +27 -0
- data/spec/dummy/db/migrate/133_create_agent_merges.rb +15 -0
- data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +13 -0
- data/spec/dummy/db/migrate/142_create_classifications.rb +19 -0
- data/spec/dummy/db/migrate/144_create_classification_types.rb +16 -0
- data/spec/dummy/db/migrate/145_create_subject_heading_types.rb +16 -0
- data/spec/dummy/db/migrate/146_create_subject_types.rb +16 -0
- data/spec/dummy/db/migrate/20081212151614_create_bookmark_stats.rb +0 -3
- data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
- data/spec/dummy/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb +11 -0
- data/spec/dummy/db/migrate/20120406020752_add_url_to_subject.rb +5 -0
- data/spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb +6 -0
- data/spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb +6 -0
- data/spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb +5 -0
- data/spec/dummy/db/migrate/20140821151023_create_colors.rb +14 -0
- data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
- data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
- data/spec/dummy/db/schema.rb +676 -593
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/default/data/index/_d2.fdt +0 -0
- data/spec/dummy/solr/default/data/index/{_3x.fnm → _d2.fnm} +0 -0
- data/spec/dummy/solr/default/data/index/{_3x.si → _d2.si} +0 -0
- data/spec/dummy/solr/default/data/index/_d2_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/{_3x_Lucene41_0.pos → _d2_Lucene41_0.pos} +0 -0
- data/spec/dummy/solr/default/data/index/{_3x_Lucene41_0.tim → _d2_Lucene41_0.tim} +0 -0
- data/spec/dummy/solr/default/data/index/_d2_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/_d3.fdt +0 -0
- data/spec/dummy/solr/default/data/index/{_3y.fnm → _d3.fnm} +0 -0
- data/spec/dummy/solr/default/data/index/{_3y.si → _d3.si} +0 -0
- data/spec/dummy/solr/default/data/index/{_3y_Lucene41_0.tim → _d3_Lucene41_0.tim} +0 -0
- data/spec/dummy/solr/default/data/index/_d3_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/_d4.fdt +0 -0
- data/spec/dummy/solr/default/data/index/{_3z.fnm → _d4.fnm} +0 -0
- data/spec/dummy/solr/default/data/index/_d4.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_d4.nvm +0 -0
- data/spec/dummy/solr/default/data/index/{_3z.si → _d4.si} +0 -0
- data/spec/dummy/solr/default/data/index/{_3z_Lucene41_0.doc → _d4_Lucene41_0.doc} +0 -0
- data/spec/dummy/solr/default/data/index/{_3z_Lucene41_0.pos → _d4_Lucene41_0.pos} +0 -0
- data/spec/dummy/solr/default/data/index/{_3z_Lucene41_0.tim → _d4_Lucene41_0.tim} +0 -0
- data/spec/dummy/solr/default/data/index/_d4_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/segments.gen +0 -0
- data/spec/dummy/solr/default/data/index/segments_hk +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000628 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000629 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000630 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/006a5adcd278a9c5c9df80a7a2b414e6 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/00a6cf2442f0e06a50f5c5f44d7aff65 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/11f06eac4db4fb45d3bb109e7f97c1c9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1f84f73be56154eba5c29f8ef2ac2177 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5867d1b0ac4e0597324985236c19a68f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/59e554f7bfa724cc56b5d8cb56ef333a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/67565528560062a46655ddd9d226e508 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6e466646ae89de53fd9397ce2555ca91 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/75a69bb28a2f0aac5401bd0e5f65effc +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/bd6a0f9e031203673fda12a83251f03b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d49e28dc6b072432f42b121b05195488 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ebc83b1f2325c61a70d933aa7a17df5a +0 -0
- data/spec/fixtures/manifestations.yml +5 -5
- metadata +157 -91
- data/spec/dummy/db/migrate/20090719201843_create_extents.rb +0 -12
- data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb +0 -6
- data/spec/dummy/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb +0 -5
- data/spec/dummy/solr/default/data/index/_3x.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_3x_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/_3x_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/_3y.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_3y_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/_3z.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_3z.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_3z.nvm +0 -0
- data/spec/dummy/solr/default/data/index/_3z_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/segments_5d +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000189 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000190 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000191 +0 -0
- data/spec/fixtures/extents.yml +0 -29
- /data/spec/dummy/solr/default/data/index/{_3x.fdx → _d2.fdx} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3x.nvd → _d2.nvd} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3x.nvm → _d2.nvm} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3y.fdx → _d3.fdx} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3y.nvd → _d3.nvd} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3y.nvm → _d3.nvm} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3y_Lucene41_0.doc → _d3_Lucene41_0.doc} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3y_Lucene41_0.pos → _d3_Lucene41_0.pos} +0 -0
- /data/spec/dummy/solr/default/data/index/{_3z.fdx → _d4.fdx} +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 19b749d2a2f3d7f0b7719deb2734aea377fdfbdf
|
4
|
+
data.tar.gz: a1627e416e8c0623ca11476b37c5a40823c477a4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c76f189a4ee49c5baf20bbe16e8694fd228a9505d5e55dcaa536d9f6ed06acede814b5884869bd2d2aca167d00034a7e2a6734ef300fb6b7bed3ae3d391a4623
|
7
|
+
data.tar.gz: 6ded3b085c8e1c88711c11a0e0637c351a78d5962b09775197be2398caa22b91ddd553e885a120170b97cf05a5ad6126c2188bb4021b4bde472467f57274de12
|
@@ -125,7 +125,7 @@ module ManifestationsHelper
|
|
125
125
|
if manifestation.volume_number_string?
|
126
126
|
title << " " + manifestation.volume_number_string
|
127
127
|
end
|
128
|
-
if manifestation.
|
128
|
+
if manifestation.serial?
|
129
129
|
if manifestation.issue_number_string?
|
130
130
|
title << " (#{manifestation.issue_number_string})"
|
131
131
|
end
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<h2 class="resource_title">
|
4
4
|
[M]
|
5
5
|
<%= link_to @parent.original_title, @parent, itemprop: 'name' -%>
|
6
|
-
<% if @parent.
|
6
|
+
<% if @parent.serial? %>
|
7
7
|
<%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
|
8
8
|
<%- end -%>
|
9
9
|
<%= link_to form_icon(@parent.carrier_type), @parent -%>
|
@@ -11,16 +11,16 @@
|
|
11
11
|
</div>
|
12
12
|
<% if current_user.try(:has_role?, 'Librarian') %>
|
13
13
|
<%- unless manifestation.items.empty? -%>
|
14
|
-
(<%=
|
14
|
+
(<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)
|
15
15
|
<% end %>
|
16
16
|
<% else %>
|
17
17
|
<%- unless manifestation.items.for_checkout.on_shelf.empty? -%>
|
18
|
-
(<%=
|
18
|
+
(<%= link_to "#", { onclick: "$('#holding_#{manifestation.id}').toggle(); return false;"} do t('page.holding') end %>)
|
19
19
|
<%- end -%>
|
20
20
|
<%- end -%>
|
21
21
|
<% if defined?(EnjuBookmark) %>
|
22
22
|
<%- if manifestation.tags.first -%>
|
23
|
-
(<%=
|
23
|
+
(<%= link_to "#", { onclick: "$('#tag_#{manifestation.id}').toggle(); return false;" } do t('activerecord.models.tag') end %>)
|
24
24
|
<%- end -%>
|
25
25
|
<%= render 'manifestations/show_tag', manifestation: manifestation -%>
|
26
26
|
<% end %>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<%= link_to title_with_volume_number(manifestation), manifestation -%>
|
7
7
|
<% end %>
|
8
8
|
</strong>
|
9
|
-
<% if manifestation.
|
9
|
+
<% if manifestation.serial? %>
|
10
10
|
<%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
|
11
11
|
<%- end -%>
|
12
12
|
<%= link_to form_icon(manifestation.carrier_type), manifestation -%>
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<strong><%= link_to manifestation.original_title, manifestation -%></strong>
|
2
|
-
<%- if manifestation.
|
2
|
+
<%- if manifestation.serial? -%>
|
3
3
|
<%= manifestation.volume_number_string -%>
|
4
4
|
<%- unless manifestation.issue_number_string.blank? -%>
|
5
5
|
(<%= manifestation.issue_number_string -%>)
|
6
6
|
<%- end -%>
|
7
7
|
<%- end -%>
|
8
8
|
<%= link_to form_icon(manifestation.carrier_type), manifestation -%>
|
9
|
-
<%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.
|
9
|
+
<%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial?')) if manifestation.serial? -%>
|
10
10
|
<%= link_to image_tag('icons/world_go.png', size: '16x16', alt: t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
|
11
11
|
<br />
|
12
12
|
<div id="creator_list_<%= manifestation.id -%>">
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<strong><%= link_to manifestation.original_title, manifestations_path(parent_id: manifestation.id, query: @query) -%></strong>
|
2
|
-
<% if manifestation.
|
2
|
+
<% if manifestation.serial? %>
|
3
3
|
<%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
|
4
4
|
<%- end -%>
|
5
5
|
<%= link_to form_icon(manifestation.carrier_type), manifestation -%>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<h2 class="resource_title">
|
3
3
|
[M]
|
4
4
|
<%= link_to title_with_volume_number(manifestation), manifestation, itemprop: 'name' -%>
|
5
|
-
<% if manifestation.
|
5
|
+
<% if manifestation.serial? %>
|
6
6
|
<%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
|
7
7
|
<%- end -%>
|
8
8
|
<%= link_to form_icon(manifestation.carrier_type), manifestation -%>
|
data/lib/enju_flower/version.rb
CHANGED
data/spec/dummy/config/boot.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
require 'rubygems'
|
2
|
-
gemfile = File.expand_path('../../../../Gemfile', __FILE__)
|
2
|
+
gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
|
3
3
|
|
4
4
|
if File.exist?(gemfile)
|
5
5
|
ENV['BUNDLE_GEMFILE'] = gemfile
|
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
|
|
7
7
|
Bundler.setup
|
8
8
|
end
|
9
9
|
|
10
|
-
$:.unshift File.expand_path('../../../../lib', __FILE__)
|
10
|
+
$:.unshift File.expand_path('../../../../lib', __FILE__)
|
Binary file
|
@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
|
|
13
13
|
t.string :access_address
|
14
14
|
t.integer :language_id, :default => 1, :null => false
|
15
15
|
t.integer :carrier_type_id, :default => 1, :null => false
|
16
|
-
t.integer :extent_id, :default => 1, :null => false
|
17
16
|
t.integer :start_page
|
18
17
|
t.integer :end_page
|
19
18
|
t.integer :height
|
@@ -0,0 +1,27 @@
|
|
1
|
+
class CreateSubjects < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
create_table :subjects do |t|
|
4
|
+
t.integer :parent_id
|
5
|
+
t.integer :use_term_id
|
6
|
+
t.string :term
|
7
|
+
t.text :term_transcription
|
8
|
+
t.integer :subject_type_id, :null => false
|
9
|
+
t.text :scope_note
|
10
|
+
t.text :note
|
11
|
+
t.integer :required_role_id, :default => 1, :null => false
|
12
|
+
t.integer :lock_version, :default => 0, :null => false
|
13
|
+
t.datetime :created_at
|
14
|
+
t.datetime :updated_at
|
15
|
+
t.datetime :deleted_at
|
16
|
+
end
|
17
|
+
add_index :subjects, :term
|
18
|
+
add_index :subjects, :parent_id
|
19
|
+
add_index :subjects, :use_term_id
|
20
|
+
add_index :subjects, :subject_type_id
|
21
|
+
add_index :subjects, :required_role_id
|
22
|
+
end
|
23
|
+
|
24
|
+
def self.down
|
25
|
+
drop_table :subjects
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
class CreateAgentMerges < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
create_table :agent_merges do |t|
|
4
|
+
t.integer :agent_id, :agent_merge_list_id, :null => false
|
5
|
+
|
6
|
+
t.timestamps
|
7
|
+
end
|
8
|
+
add_index :agent_merges, :agent_id
|
9
|
+
add_index :agent_merges, :agent_merge_list_id
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.down
|
13
|
+
drop_table :agent_merges
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
class CreateClassifications < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
create_table :classifications do |t|
|
4
|
+
t.integer :parent_id
|
5
|
+
t.string :category, :null => false
|
6
|
+
t.text :note
|
7
|
+
t.integer :classification_type_id, :null => false
|
8
|
+
|
9
|
+
t.timestamps
|
10
|
+
end
|
11
|
+
add_index :classifications, :parent_id
|
12
|
+
add_index :classifications, :category
|
13
|
+
add_index :classifications, :classification_type_id
|
14
|
+
end
|
15
|
+
|
16
|
+
def self.down
|
17
|
+
drop_table :classifications
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
class CreateClassificationTypes < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
create_table :classification_types do |t|
|
4
|
+
t.string :name, :null => false
|
5
|
+
t.text :display_name
|
6
|
+
t.text :note
|
7
|
+
t.integer :position
|
8
|
+
|
9
|
+
t.timestamps
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
def self.down
|
14
|
+
drop_table :classification_types
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
class CreateSubjectHeadingTypes < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
create_table :subject_heading_types do |t|
|
4
|
+
t.string :name, :null => false
|
5
|
+
t.text :display_name
|
6
|
+
t.text :note
|
7
|
+
t.integer :position
|
8
|
+
|
9
|
+
t.timestamps
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
def self.down
|
14
|
+
drop_table :subject_heading_types
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
class CreateSubjectTypes < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
create_table :subject_types do |t|
|
4
|
+
t.string :name, :null => false
|
5
|
+
t.text :display_name
|
6
|
+
t.text :note
|
7
|
+
t.integer :position
|
8
|
+
|
9
|
+
t.timestamps
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
def self.down
|
14
|
+
drop_table :subject_types
|
15
|
+
end
|
16
|
+
end
|
@@ -7,6 +7,6 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration
|
|
7
7
|
t.timestamps
|
8
8
|
end
|
9
9
|
add_index :series_statement_merges, :series_statement_id
|
10
|
-
add_index :series_statement_merges, :series_statement_merge_list_id
|
10
|
+
add_index :series_statement_merges, :series_statement_merge_list_id, name: "index_series_statement_merges_on_list_id"
|
11
11
|
end
|
12
12
|
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
class AddLftAndRgtToClassification < ActiveRecord::Migration
|
2
|
+
def self.up
|
3
|
+
add_column :classifications, :lft, :integer
|
4
|
+
add_column :classifications, :rgt, :integer
|
5
|
+
end
|
6
|
+
|
7
|
+
def self.down
|
8
|
+
remove_column :classifications, :rgt
|
9
|
+
remove_column :classifications, :lft
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
class CreateColors < ActiveRecord::Migration
|
2
|
+
def change
|
3
|
+
create_table :colors do |t|
|
4
|
+
t.integer :library_group_id
|
5
|
+
t.string :property
|
6
|
+
t.string :code
|
7
|
+
t.integer :position
|
8
|
+
|
9
|
+
t.timestamps
|
10
|
+
end
|
11
|
+
|
12
|
+
add_index :colors, :library_group_id
|
13
|
+
end
|
14
|
+
end
|