enju_circulation 0.1.0.pre49 → 0.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/profiles/_checkout_list.html.erb +2 -2
- data/app/views/profiles/_submenu_checkout.html.erb +2 -2
- data/lib/enju_circulation/item.rb +1 -1
- data/lib/enju_circulation/version.rb +1 -1
- data/spec/views/checkouts/edit.html.erb_spec.rb +1 -0
- data/spec/views/checkouts/show.html.erb_spec.rb +1 -0
- metadata +8 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 36c7b0cdffa83e769e73f3b1beb9e6705af07044
|
4
|
+
data.tar.gz: 1e0eddb8648a35597e0def7945cdd37e30a565fb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7a321cce817645bf567a8e903a3ea217e1a89d0eecaac34c046d85c10698377b9699fb0762b7988e95a3188f473dca5abdab38375571be287063a8ac73c2e5df
|
7
|
+
data.tar.gz: ba2501c18c23e0fd614afc0a8336d742cf054ce59a05d34f369664da871d575afd8959ad021e5df0dc45d595e0b9415ae6e26abebf1148a890570d48e9fd94cc
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: current_user.username, format: :rss) %>
|
5
5
|
<%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: current_user.username, format: :txt) %>
|
6
6
|
</h2>
|
7
|
-
<% if
|
8
|
-
<%= render 'checkouts/list', checkouts:
|
7
|
+
<% if profile.user %>
|
8
|
+
<%= render 'checkouts/list', checkouts: profile.user.checkouts.order('created_at DESC').page(params[:page]) %>
|
9
9
|
<% end %>
|
10
10
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<ul>
|
2
|
-
<%-
|
2
|
+
<%- profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
|
3
3
|
<li>
|
4
4
|
<%= available_checkout_type.checkout_type.display_name.localize -%>:
|
5
|
-
<%=
|
5
|
+
<%= profile.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
|
6
6
|
</li>
|
7
7
|
<%- end -%>
|
8
8
|
</ul>
|
@@ -32,7 +32,7 @@ module EnjuCirculation
|
|
32
32
|
'circulation_statuses.name' => FOR_CHECKOUT_CIRCULATION_STATUS,
|
33
33
|
'use_restrictions.name' => FOR_CHECKOUT_USE_RESTRICTION
|
34
34
|
).where(identifier_conditions)
|
35
|
-
|
35
|
+
}
|
36
36
|
scope :removed, -> { includes(:circulation_status).where('circulation_statuses.name' => 'Removed') }
|
37
37
|
has_many :checkouts
|
38
38
|
has_many :reserves
|
@@ -6,6 +6,7 @@ describe "checkouts/edit" do
|
|
6
6
|
before(:each) do
|
7
7
|
@checkout = assign(:checkout, checkouts(:checkout_00001))
|
8
8
|
assign(:new_due_date, 1.day.from_now)
|
9
|
+
assign(:library_group, LibraryGroup.site_config)
|
9
10
|
view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
|
10
11
|
end
|
11
12
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_circulation
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.0
|
4
|
+
version: 0.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-11-
|
11
|
+
date: 2015-11-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: enju_leaf
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.1.0
|
19
|
+
version: 1.1.0
|
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: 1.1.0
|
26
|
+
version: 1.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: enju_event
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.1.17
|
33
|
+
version: 0.1.17
|
34
34
|
type: :runtime
|
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: 0.1.17
|
40
|
+
version: 0.1.17
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: sqlite3
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -771,9 +771,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
771
771
|
version: '0'
|
772
772
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
773
773
|
requirements:
|
774
|
-
- - "
|
774
|
+
- - ">="
|
775
775
|
- !ruby/object:Gem::Version
|
776
|
-
version:
|
776
|
+
version: '0'
|
777
777
|
requirements: []
|
778
778
|
rubyforge_project:
|
779
779
|
rubygems_version: 2.4.5.1
|