enju_library 0.1.0.pre12 → 0.1.0.pre13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/enju_library/ability.rb +3 -3
- data/app/views/accepts/index.html.erb +1 -1
- data/app/views/bookstores/index.html.erb +1 -1
- data/app/views/budget_types/index.html.erb +1 -1
- data/app/views/libraries/index.html.erb +1 -1
- data/app/views/request_status_types/index.html.erb +1 -1
- data/app/views/request_types/index.html.erb +1 -1
- data/app/views/search_engines/index.html.erb +1 -1
- data/app/views/shelves/index.html.erb +1 -1
- data/app/views/subscriptions/index.html.erb +1 -1
- data/lib/enju_library/version.rb +1 -1
- data/spec/dummy/app/controllers/application_controller.rb +3 -3
- data/spec/dummy/app/models/ability.rb +63 -48
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.fdt → _7d.fdt} +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.fdx → _7d.fdx} +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.fnm → _7d.fnm} +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.frq → _7d.frq} +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.nrm → _7d.nrm} +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.prx → _7d.prx} +0 -0
- data/spec/dummy/solr/data/test/index/{_3b.tii → _7d.tii} +0 -0
- data/spec/dummy/solr/data/test/index/_7d.tis +0 -0
- data/spec/dummy/solr/data/test/index/segments.gen +0 -0
- data/spec/dummy/solr/data/test/index/{segments_7t → segments_hb} +0 -0
- data/spec/fixtures/library_groups.yml +1 -0
- metadata +31 -31
- data/spec/dummy/solr/data/test/index/_3b.tis +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: de8afd76d4f213b4c2e6a12d36daff4d365ae849
|
4
|
+
data.tar.gz: 5f27c3dd400adbf75c65c91dddb43d40bc86b5ec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3c0b3712c30b1451d90c564bdd88c5bf2804513c378122b4e5d4f3d473e8818924789ae3369c27928e28fddba7584cd3bb19fce54e43764f048e4679afbae63b
|
7
|
+
data.tar.gz: 811a0084e629138938c68a8c8c5e985c5e99d119a55a7ee2f58e3bb26ec4a76c0ca2aabc0dde838676add02c0c38a3afd00b5e31d237f0d62f64856502e86184
|
@@ -6,15 +6,15 @@ module EnjuLibrary
|
|
6
6
|
case user.try(:role).try(:name)
|
7
7
|
when 'Administrator'
|
8
8
|
can [:read, :create, :update], Bookstore
|
9
|
-
can :destroy, Bookstore do |bookstore|
|
9
|
+
can [:delete, :destroy], Bookstore do |bookstore|
|
10
10
|
bookstore.items.empty?
|
11
11
|
end
|
12
12
|
can [:read, :create, :update], Library
|
13
|
-
can :destroy, Library do |library|
|
13
|
+
can [:delete, :destroy], Library do |library|
|
14
14
|
library.shelves.empty? and !library.web?
|
15
15
|
end
|
16
16
|
can [:read, :create, :update], Shelf
|
17
|
-
can :destroy, Shelf do |shelf|
|
17
|
+
can [:delete, :destroy], Shelf do |shelf|
|
18
18
|
shelf.items.empty?
|
19
19
|
end
|
20
20
|
can :manage, [
|
@@ -28,7 +28,7 @@
|
|
28
28
|
<%- if can? :update, bookstore -%>
|
29
29
|
<%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_bookstore_path(bookstore) -%>
|
30
30
|
<% end %>
|
31
|
-
<%- if can? :
|
31
|
+
<%- if can? :delete, bookstore -%>
|
32
32
|
<%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), bookstore, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
33
33
|
<%- end -%>
|
34
34
|
</td>
|
@@ -25,7 +25,7 @@
|
|
25
25
|
<%- if can? :update, budget_type -%>
|
26
26
|
<%= link_to t('page.edit'), edit_budget_type_path(budget_type) -%>
|
27
27
|
<% end %>
|
28
|
-
<%- if can? :
|
28
|
+
<%- if can? :delete, budget_type -%>
|
29
29
|
<%= link_to t('page.destroy'), budget_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
30
30
|
<%- end -%>
|
31
31
|
</td>
|
@@ -54,7 +54,7 @@
|
|
54
54
|
<%- if can? :update, library -%>
|
55
55
|
<%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_library_path(library) -%>
|
56
56
|
<% end %>
|
57
|
-
<%- if can? :
|
57
|
+
<%- if can? :delete, library -%>
|
58
58
|
<%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), library, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
59
59
|
<%- end -%>
|
60
60
|
</td>
|
@@ -23,7 +23,7 @@
|
|
23
23
|
<%- if can? :update, request_status_type -%>
|
24
24
|
<%= link_to t('page.edit'), edit_request_status_type_path(request_status_type) -%>
|
25
25
|
<% end %>
|
26
|
-
<%- if can? :
|
26
|
+
<%- if can? :delete, request_status_type -%>
|
27
27
|
<%= link_to t('page.destroy'), request_status_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
28
28
|
<% end %>
|
29
29
|
</td>
|
@@ -23,7 +23,7 @@
|
|
23
23
|
<%- if can? :update, request_type -%>
|
24
24
|
<%= link_to t('page.edit'), edit_request_type_path(request_type) -%>
|
25
25
|
<% end %>
|
26
|
-
<%- if can? :
|
26
|
+
<%- if can? :delete, request_type -%>
|
27
27
|
<%= link_to t('page.destroy'), request_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
28
28
|
<% end %>
|
29
29
|
</td>
|
@@ -25,7 +25,7 @@
|
|
25
25
|
<%- if can? :update, search_engine -%>
|
26
26
|
<%= link_to t('page.edit'), edit_search_engine_path(search_engine) -%>
|
27
27
|
<% end %>
|
28
|
-
<%- if can? :
|
28
|
+
<%- if can? :delete, search_engine -%>
|
29
29
|
<%= link_to t('page.destroy'), search_engine, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
30
30
|
<%- end -%>
|
31
31
|
</td>
|
@@ -51,7 +51,7 @@
|
|
51
51
|
<%- if can? :update, shelf -%>
|
52
52
|
<%= link_to t('page.edit'), edit_shelf_path(shelf) -%>
|
53
53
|
<% end %>
|
54
|
-
<%- if can? :
|
54
|
+
<%- if can? :delete, shelf -%>
|
55
55
|
<%= link_to t('page.destroy'), shelf, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
56
56
|
<%- end -%>
|
57
57
|
</td>
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<td><%= link_to subscription.title, subscription -%></td>
|
15
15
|
<td><%= subscription.works.size -%></td>
|
16
16
|
<td>
|
17
|
-
<% if can? :
|
17
|
+
<% if can? :delete, subscription %>
|
18
18
|
<%= link_to t('page.edit'), edit_subscription_path(subscription) -%>
|
19
19
|
<%= link_to t('page.destroy'), subscription, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
20
20
|
<% end %>
|
data/lib/enju_library/version.rb
CHANGED
@@ -39,9 +39,9 @@ class ApplicationController < ActionController::Base
|
|
39
39
|
raise CanCan::AccessDenied
|
40
40
|
end
|
41
41
|
|
42
|
-
def current_ability
|
43
|
-
|
44
|
-
end
|
42
|
+
#def current_ability
|
43
|
+
# @current_ability ||= Ability.new(current_user, request.remote_ip.split('%')[0])
|
44
|
+
#end
|
45
45
|
|
46
46
|
def solr_commit
|
47
47
|
Sunspot.commit
|
@@ -1,53 +1,68 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
can :destroy, Bookstore do |bookstore|
|
11
|
-
if defined?(EnjuPurchaseRequest)
|
12
|
-
bookstore.order_lists.empty? and bookstore.items.empty?
|
13
|
-
else
|
1
|
+
#module EnjuLibrary
|
2
|
+
class Ability
|
3
|
+
include CanCan::Ability
|
4
|
+
|
5
|
+
def initialize(user)
|
6
|
+
case user.try(:role).try(:name)
|
7
|
+
when 'Administrator'
|
8
|
+
can [:read, :create, :update], Bookstore
|
9
|
+
can [:delete, :destroy], Bookstore do |bookstore|
|
14
10
|
bookstore.items.empty?
|
15
11
|
end
|
12
|
+
can [:read, :create, :update], Library
|
13
|
+
can [:delete, :destroy], Library do |library|
|
14
|
+
library.shelves.empty? and !library.web?
|
15
|
+
end
|
16
|
+
can [:read, :create, :update], Shelf
|
17
|
+
can [:delete, :destroy], Shelf do |shelf|
|
18
|
+
shelf.items.empty?
|
19
|
+
end
|
20
|
+
can :manage, [
|
21
|
+
Accept,
|
22
|
+
BudgetType,
|
23
|
+
SearchEngine,
|
24
|
+
Subscribe,
|
25
|
+
Subscription
|
26
|
+
]
|
27
|
+
can :update, [
|
28
|
+
LibraryGroup,
|
29
|
+
RequestStatusType,
|
30
|
+
RequestType
|
31
|
+
]
|
32
|
+
can :read, [
|
33
|
+
LibraryGroup,
|
34
|
+
RequestStatusType,
|
35
|
+
RequestType
|
36
|
+
]
|
37
|
+
when 'Librarian'
|
38
|
+
can :manage, [
|
39
|
+
Accept,
|
40
|
+
Subscribe,
|
41
|
+
Subscription
|
42
|
+
]
|
43
|
+
can :read, [
|
44
|
+
Bookstore,
|
45
|
+
BudgetType,
|
46
|
+
Library,
|
47
|
+
LibraryGroup,
|
48
|
+
RequestStatusType,
|
49
|
+
RequestType,
|
50
|
+
SearchEngine,
|
51
|
+
Shelf
|
52
|
+
]
|
53
|
+
when 'User'
|
54
|
+
can :read, [
|
55
|
+
Library,
|
56
|
+
LibraryGroup,
|
57
|
+
Shelf
|
58
|
+
]
|
59
|
+
else
|
60
|
+
can :read, [
|
61
|
+
Library,
|
62
|
+
LibraryGroup,
|
63
|
+
Shelf
|
64
|
+
]
|
16
65
|
end
|
17
|
-
can [:read, :create, :update], Library
|
18
|
-
can :destroy, Library do |library|
|
19
|
-
library.shelves.empty? and !library.web?
|
20
|
-
end
|
21
|
-
can [:read, :update], LibraryGroup
|
22
|
-
can [:read, :update], RequestStatusType
|
23
|
-
can [:read, :update], RequestType
|
24
|
-
can [:read, :create, :update], Shelf
|
25
|
-
can :destroy, Shelf do |shelf|
|
26
|
-
shelf.items.empty?
|
27
|
-
end
|
28
|
-
can :manage, SearchEngine
|
29
|
-
can :manage, Subscribe
|
30
|
-
can :manage, Subscription
|
31
|
-
when 'Librarian'
|
32
|
-
can :manage, Accept
|
33
|
-
can :read, Bookstore
|
34
|
-
can :read, BudgetType
|
35
|
-
can :read, Library
|
36
|
-
can :read, LibraryGroup
|
37
|
-
can :read, RequestStatusType
|
38
|
-
can :read, RequestType
|
39
|
-
can :read, Shelf
|
40
|
-
can :read, SearchEngine
|
41
|
-
can :manage, Subscribe
|
42
|
-
can :manage, Subscription
|
43
|
-
when 'User'
|
44
|
-
can :read, Shelf
|
45
|
-
can :read, Library
|
46
|
-
can :read, LibraryGroup
|
47
|
-
else
|
48
|
-
can :read, Library
|
49
|
-
can :read, LibraryGroup
|
50
|
-
can :read, Shelf
|
51
66
|
end
|
52
67
|
end
|
53
|
-
end
|
68
|
+
#end
|
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
Binary file
|
Binary file
|
Binary file
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_library
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.0.
|
4
|
+
version: 0.1.0.pre13
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.2.13.
|
19
|
+
version: 3.2.13.rc2
|
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: 3.2.13.
|
26
|
+
version: 3.2.13.rc2
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: enju_core
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -156,14 +156,14 @@ dependencies:
|
|
156
156
|
requirements:
|
157
157
|
- - ~>
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 0.1.0.
|
159
|
+
version: 0.1.0.pre10
|
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: 0.1.0.
|
166
|
+
version: 0.1.0.pre10
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: enju_manifestation_viewer
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -184,56 +184,56 @@ dependencies:
|
|
184
184
|
requirements:
|
185
185
|
- - ~>
|
186
186
|
- !ruby/object:Gem::Version
|
187
|
-
version: 0.1.0.
|
187
|
+
version: 0.1.0.pre23
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
192
|
- - ~>
|
193
193
|
- !ruby/object:Gem::Version
|
194
|
-
version: 0.1.0.
|
194
|
+
version: 0.1.0.pre23
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: enju_event
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
199
|
- - ~>
|
200
200
|
- !ruby/object:Gem::Version
|
201
|
-
version: 0.1.17.
|
201
|
+
version: 0.1.17.pre7
|
202
202
|
type: :development
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
206
|
- - ~>
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version: 0.1.17.
|
208
|
+
version: 0.1.17.pre7
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: enju_circulation
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
213
|
- - ~>
|
214
214
|
- !ruby/object:Gem::Version
|
215
|
-
version: 0.1.0.
|
215
|
+
version: 0.1.0.pre15
|
216
216
|
type: :development
|
217
217
|
prerelease: false
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
219
219
|
requirements:
|
220
220
|
- - ~>
|
221
221
|
- !ruby/object:Gem::Version
|
222
|
-
version: 0.1.0.
|
222
|
+
version: 0.1.0.pre15
|
223
223
|
- !ruby/object:Gem::Dependency
|
224
224
|
name: enju_inter_library_loan
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|
226
226
|
requirements:
|
227
227
|
- - ~>
|
228
228
|
- !ruby/object:Gem::Version
|
229
|
-
version: 0.1.0.
|
229
|
+
version: 0.1.0.pre6
|
230
230
|
type: :development
|
231
231
|
prerelease: false
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
234
|
- - ~>
|
235
235
|
- !ruby/object:Gem::Version
|
236
|
-
version: 0.1.0.
|
236
|
+
version: 0.1.0.pre6
|
237
237
|
- !ruby/object:Gem::Dependency
|
238
238
|
name: sunspot_solr
|
239
239
|
requirement: !ruby/object:Gem::Requirement
|
@@ -540,16 +540,16 @@ files:
|
|
540
540
|
- spec/dummy/solr/conf/spellings.txt
|
541
541
|
- spec/dummy/solr/conf/stopwords.txt
|
542
542
|
- spec/dummy/solr/conf/synonyms.txt
|
543
|
-
- spec/dummy/solr/data/test/index/
|
544
|
-
- spec/dummy/solr/data/test/index/
|
545
|
-
- spec/dummy/solr/data/test/index/
|
546
|
-
- spec/dummy/solr/data/test/index/
|
547
|
-
- spec/dummy/solr/data/test/index/
|
548
|
-
- spec/dummy/solr/data/test/index/
|
549
|
-
- spec/dummy/solr/data/test/index/
|
550
|
-
- spec/dummy/solr/data/test/index/
|
543
|
+
- spec/dummy/solr/data/test/index/_7d.fdt
|
544
|
+
- spec/dummy/solr/data/test/index/_7d.fdx
|
545
|
+
- spec/dummy/solr/data/test/index/_7d.fnm
|
546
|
+
- spec/dummy/solr/data/test/index/_7d.frq
|
547
|
+
- spec/dummy/solr/data/test/index/_7d.nrm
|
548
|
+
- spec/dummy/solr/data/test/index/_7d.prx
|
549
|
+
- spec/dummy/solr/data/test/index/_7d.tii
|
550
|
+
- spec/dummy/solr/data/test/index/_7d.tis
|
551
551
|
- spec/dummy/solr/data/test/index/segments.gen
|
552
|
-
- spec/dummy/solr/data/test/index/
|
552
|
+
- spec/dummy/solr/data/test/index/segments_hb
|
553
553
|
- spec/dummy/solr/data/test/spellchecker/segments.gen
|
554
554
|
- spec/dummy/solr/data/test/spellchecker/segments_1
|
555
555
|
- spec/dummy/tmp/cache/4AD/470/country_all
|
@@ -769,16 +769,16 @@ test_files:
|
|
769
769
|
- spec/dummy/solr/conf/spellings.txt
|
770
770
|
- spec/dummy/solr/conf/stopwords.txt
|
771
771
|
- spec/dummy/solr/conf/synonyms.txt
|
772
|
-
- spec/dummy/solr/data/test/index/
|
773
|
-
- spec/dummy/solr/data/test/index/
|
774
|
-
- spec/dummy/solr/data/test/index/
|
775
|
-
- spec/dummy/solr/data/test/index/
|
776
|
-
- spec/dummy/solr/data/test/index/
|
777
|
-
- spec/dummy/solr/data/test/index/
|
778
|
-
- spec/dummy/solr/data/test/index/
|
779
|
-
- spec/dummy/solr/data/test/index/
|
772
|
+
- spec/dummy/solr/data/test/index/_7d.fdt
|
773
|
+
- spec/dummy/solr/data/test/index/_7d.fdx
|
774
|
+
- spec/dummy/solr/data/test/index/_7d.fnm
|
775
|
+
- spec/dummy/solr/data/test/index/_7d.frq
|
776
|
+
- spec/dummy/solr/data/test/index/_7d.nrm
|
777
|
+
- spec/dummy/solr/data/test/index/_7d.prx
|
778
|
+
- spec/dummy/solr/data/test/index/_7d.tii
|
779
|
+
- spec/dummy/solr/data/test/index/_7d.tis
|
780
780
|
- spec/dummy/solr/data/test/index/segments.gen
|
781
|
-
- spec/dummy/solr/data/test/index/
|
781
|
+
- spec/dummy/solr/data/test/index/segments_hb
|
782
782
|
- spec/dummy/solr/data/test/spellchecker/segments.gen
|
783
783
|
- spec/dummy/solr/data/test/spellchecker/segments_1
|
784
784
|
- spec/dummy/tmp/cache/4AD/470/country_all
|
Binary file
|