enju_circulation 0.1.0.pre45 → 0.1.0.pre46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +1 -1
  3. data/app/views/checkout_types/show.html.erb +6 -2
  4. data/app/views/circulation_statuses/show.html.erb +3 -1
  5. data/app/views/use_restrictions/show.html.erb +3 -1
  6. data/lib/enju_circulation/profile.rb +1 -1
  7. data/lib/enju_circulation/user.rb +0 -8
  8. data/lib/enju_circulation/version.rb +1 -1
  9. data/spec/dummy/app/models/user.rb +1 -1
  10. data/spec/factories/user.rb +0 -3
  11. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 221ca150ecf674e9c773798930e314dd4f36feac
4
- data.tar.gz: c7a4e4a14dfa75488958e2885572e0e2d4bc1f66
3
+ metadata.gz: dbac65337fbd0c74d751430f251d7943ef5bb033
4
+ data.tar.gz: 2a6dc125d89d8211aeb4894b01ced7e2bda78dc2
5
5
  SHA512:
6
- metadata.gz: 3ea15535e7b36df2154fc75ac3172521cec3fb0d10279803a248a162ccf9afec5efca684ae899bb277e6cb952427b21cd9fd9d7297e48e61d68c8942680f40bf
7
- data.tar.gz: 53068cdc6785ee212ef0473bd7e4bded77f623b94050d0f5ac0f5ebf55a48b9b1e82e7f4d40f65c4f4bc0ccf72561011b8e4fcf8359d89150a1b643e89aa921b
6
+ metadata.gz: fc45fed8e102b392090e5127beba9375054da1dca6aaef35001a84be3bddb5f05d08ef76a7913695618b98d2f52fb53df167fd5f6ea204d9d6b1b137b3b82dd2
7
+ data.tar.gz: ce5d0588de1a7e09995298206cf78fecd29fd78deac88c0e3f0d3fca41de3e1026abe58ee9363e46491a944b2493bc0bdecd67e36eab152a850e4f65781a4a5f
data/MIT-LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright 2012 Kosuke Tanabe
1
+ Copyright 2015 Project Next-L
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
data/app/views/checkout_types/show.html.erb CHANGED
@@ -31,8 +31,12 @@
31
31
 
32
32
  <div id="submenu" class="ui-corner-all ui-widget-content">
33
33
  <ul>
34
- <li><%= link_to t('page.edit'), edit_checkout_type_path(@checkout_type) -%></li>
34
+ <%- if can? :update, @checkout_type -%>
35
+ <li><%= link_to t('page.edit'), edit_checkout_type_path(@checkout_type) -%></li>
36
+ <%- end -%>
35
37
  <li><%= back_to_index(flash[:page_info]) -%></li>
36
- <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_checkout_type_user_group_has_checkout_type_path(@checkout_type) -%></li>
38
+ <%- if can? :create, UserGroupHasCheckoutType -%>
39
+ <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_checkout_type_user_group_has_checkout_type_path(@checkout_type) -%></li>
40
+ <%- end -%>
37
41
  </ul>
38
42
  </div>
data/app/views/circulation_statuses/show.html.erb CHANGED
@@ -23,7 +23,9 @@
23
23
 
24
24
  <div id="submenu" class="ui-corner-all ui-widget-content">
25
25
  <ul>
26
- <li><%= link_to t('page.edit'), edit_circulation_status_path(@circulation_status) -%></li>
26
+ <%- if can? :update, @circulation_status -%>
27
+ <li><%= link_to t('page.edit'), edit_circulation_status_path(@circulation_status) -%></li>
28
+ <%- end -%>
27
29
  <li><%= back_to_index(flash[:page_info]) -%></li>
28
30
  </ul>
29
31
  </div>
data/app/views/use_restrictions/show.html.erb CHANGED
@@ -23,7 +23,9 @@
23
23
 
24
24
  <div id="submenu" class="ui-corner-all ui-widget-content">
25
25
  <ul>
26
- <li><%= link_to t('page.edit'), edit_use_restriction_path(@use_restriction) -%></li>
26
+ <%- if can? :update, @use_restriction -%>
27
+ <li><%= link_to t('page.edit'), edit_use_restriction_path(@use_restriction) -%></li>
28
+ <%- end -%>
27
29
  <li><%= back_to_index(flash[:page_info]) -%></li>
28
30
  </ul>
29
31
  </div>
data/lib/enju_circulation/profile.rb CHANGED
@@ -12,7 +12,7 @@ module EnjuCirculation
12
12
 
13
13
  module InstanceMethods
14
14
  def reset_checkout_icalendar_token
15
- self.checkout_icalendar_token = Devise.friendly_token
15
+ self.checkout_icalendar_token = SecureRandom.hex(16)
16
16
  end
17
17
 
18
18
  def delete_checkout_icalendar_token
data/lib/enju_circulation/user.rb CHANGED
@@ -32,14 +32,6 @@ module EnjuCirculation
32
32
  end
33
33
  end
34
34
 
35
- def reset_checkout_icalendar_token
36
- self.checkout_icalendar_token = Devise.friendly_token
37
- end
38
-
39
- def delete_checkout_icalendar_token
40
- self.checkout_icalendar_token = nil
41
- end
42
-
43
35
  def checked_item_count
44
36
  checkout_count = {}
45
37
  CheckoutType.all.each do |checkout_type|
data/lib/enju_circulation/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuCirculation
2
- VERSION = "0.1.0.pre45"
2
+ VERSION = "0.1.0.pre46"
3
3
  end
data/spec/dummy/app/models/user.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  class User < ActiveRecord::Base
2
2
  # Include default devise modules. Others available are:
3
3
  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
4
- devise :database_authenticatable, :registerable,
4
+ devise :database_authenticatable, #:registerable,
5
5
  :recoverable, :rememberable, :trackable, :validatable
6
6
 
7
7
  # Setup accessible (or protected) attributes for your model
data/spec/factories/user.rb CHANGED
@@ -2,7 +2,6 @@ FactoryGirl.define do
2
2
  factory :admin, :class => User do |f|
3
3
  f.sequence(:username){|n| "admin_#{n}"}
4
4
  f.sequence(:email){|n| "admin_#{n}@example.jp"}
5
- f.email_confirmation{|u| u.email}
6
5
  f.role {Role.find_by_name('Administrator')}
7
6
  f.password 'adminpassword'
8
7
  f.password_confirmation 'adminpassword'
@@ -11,7 +10,6 @@ FactoryGirl.define do
11
10
  factory :librarian, :class => User do |f|
12
11
  f.sequence(:username){|n| "librarian_#{n}"}
13
12
  f.sequence(:email){|n| "librarian_#{n}@example.jp"}
14
- f.email_confirmation{|u| u.email}
15
13
  f.role {Role.find_by_name('Librarian')}
16
14
  f.password 'librarianpassword'
17
15
  f.password_confirmation 'librarianpassword'
@@ -20,7 +18,6 @@ FactoryGirl.define do
20
18
  factory :user, :class => User do |f|
21
19
  f.sequence(:username){|n| "user_#{n}"}
22
20
  f.sequence(:email){|n| "user_#{n}@example.jp"}
23
- f.email_confirmation{|u| u.email}
24
21
  f.role {Role.find_by_name('User')}
25
22
  f.password 'userpassword'
26
23
  f.password_confirmation 'userpassword'
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.pre45
4
+ version: 0.1.0.pre46
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-05-10 00:00:00.000000000 Z
11
+ date: 2015-06-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -44,42 +44,42 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.14.pre22
47
+ version: 0.1.14.pre24
48
48
  type: :runtime
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.1.14.pre22
54
+ version: 0.1.14.pre24
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: enju_event
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.1.17.pre25
61
+ version: 0.1.17.pre26
62
62
  type: :runtime
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.1.17.pre25
68
+ version: 0.1.17.pre26
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: enju_leaf
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.1.0.rc18
75
+ version: 1.1.0.rc19
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: 1.1.0.rc18
82
+ version: 1.1.0.rc19
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sqlite3
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '3.2'
131
+ version: '3.3'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: '3.2'
138
+ version: '3.3'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: factory_girl_rails
141
141
  requirement: !ruby/object:Gem::Requirement