enju_library 0.1.0.pre35 → 0.1.0.pre36

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 (50) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/accepts_controller.rb +40 -2
  3. data/app/controllers/bookstores_controller.rb +72 -6
  4. data/app/controllers/budget_types_controller.rb +74 -4
  5. data/app/controllers/request_status_types_controller.rb +74 -4
  6. data/app/controllers/request_types_controller.rb +74 -4
  7. data/app/controllers/search_engines_controller.rb +72 -6
  8. data/app/views/accepts/_list.html.erb +1 -1
  9. data/app/views/libraries/show.html.erb +2 -1
  10. data/app/views/picture_files/_index_shelf.html.erb +54 -0
  11. data/config/locales/translation_en.yml +8 -0
  12. data/config/locales/translation_ja.yml +9 -1
  13. data/config/routes.rb +3 -9
  14. data/lib/enju_library/engine.rb +0 -1
  15. data/lib/enju_library/version.rb +1 -1
  16. data/spec/dummy/db/test.sqlite3 +0 -0
  17. data/spec/dummy/solr/default/data/index/{_1vz.fdt → _1we.fdt} +0 -0
  18. data/spec/dummy/solr/default/data/index/{_1vz.fdx → _1we.fdx} +0 -0
  19. data/spec/dummy/solr/default/data/index/{_1vz.fnm → _1we.fnm} +0 -0
  20. data/spec/dummy/solr/default/data/index/{_1vz.nvd → _1we.nvd} +0 -0
  21. data/spec/dummy/solr/default/data/index/{_1vz.nvm → _1we.nvm} +0 -0
  22. data/spec/dummy/solr/default/data/index/{_1vz.si → _1we.si} +0 -0
  23. data/spec/dummy/solr/default/data/index/{_1vz_Lucene41_0.doc → _1we_Lucene41_0.doc} +0 -0
  24. data/spec/dummy/solr/default/data/index/{_1vz_Lucene41_0.pos → _1we_Lucene41_0.pos} +0 -0
  25. data/spec/dummy/solr/default/data/index/_1we_Lucene41_0.tim +0 -0
  26. data/spec/dummy/solr/default/data/index/{_1vz_Lucene41_0.tip → _1we_Lucene41_0.tip} +0 -0
  27. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  28. data/spec/dummy/solr/default/data/index/segments_37q +0 -0
  29. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004155 +0 -0
  30. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000004122 → tlog.0000000000000004156} +0 -0
  31. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004157 +0 -0
  32. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004158 +0 -0
  33. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004159 +0 -0
  34. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004160 +0 -0
  35. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004161 +0 -0
  36. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004162 +0 -0
  37. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004163 +0 -0
  38. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004164 +0 -0
  39. metadata +55 -68
  40. data/spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tim +0 -0
  41. data/spec/dummy/solr/default/data/index/segments_36s +0 -0
  42. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004121 +0 -0
  43. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004123 +0 -0
  44. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004124 +0 -0
  45. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004125 +0 -0
  46. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004126 +0 -0
  47. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004127 +0 -0
  48. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004128 +0 -0
  49. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004129 +0 -0
  50. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004130 +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3d41a986fc7fa25df342d1b4569dfe70e796ca60
4
- data.tar.gz: 920c55225cb16636ebc7f8e16c574453365a691a
3
+ metadata.gz: 8b94a2674d770a3478bbbff653c266530e3db08b
4
+ data.tar.gz: c566bfd340977a3df85685428d38dccc75acab0e
5
5
  SHA512:
6
- metadata.gz: 48bc2902bda265c13dc7c62ce4e804b60ebb9034f22c2adb960057381a0a5ff5d79bea0671d63fd1ea87e11a7a6e6b906f41728c59ac4134b1321b6e2f888a8e
7
- data.tar.gz: 81d848e176a37a267b1fe309c60ffab818787e0001528d86165c0851441f8a4bebce6e3364b65993da1cb3f5205d0d5f4297e54774f4be62efeb5fe2effd45f7
6
+ metadata.gz: f7a081eff08d89d647199231ce7be31ee935a936b54d024e3d9e9286bc972b9d8f1c8bd7aa72520af223d29a9397e2fce865d81a287f10ceadeb40ae340095df
7
+ data.tar.gz: 24db20754ef9360aa26a8438a72420396db9a1da7b393314d1c762ade2e0cdac9c58e500eda5ce99480f8f32b7ea9953c5fbcb5114b9afc1b8ed95e6fa0175ce
@@ -1,7 +1,6 @@
1
- class AcceptsController < InheritedResources::Base
1
+ class AcceptsController < ApplicationController
2
2
  load_and_authorize_resource except: :index
3
3
  authorize_resource only: :index
4
- respond_to :html, :json
5
4
  before_filter :get_basket, only: [:index, :create]
6
5
 
7
6
  # GET /accepts
@@ -34,6 +33,15 @@ class AcceptsController < InheritedResources::Base
34
33
  end
35
34
  end
36
35
 
36
+ # GET /accepts/1
37
+ # GET /accepts/1.json
38
+ def show
39
+ respond_to do |format|
40
+ format.html # show.html.erb
41
+ format.json { render json: @accept }
42
+ end
43
+ end
44
+
37
45
  # GET /new
38
46
  # GET /new.json
39
47
  def new
@@ -49,6 +57,11 @@ class AcceptsController < InheritedResources::Base
49
57
  end
50
58
  end
51
59
 
60
+ # GET /accepts/new
61
+ # GET /accepts/1/edit
62
+ def edit
63
+ end
64
+
52
65
  # POST /accepts
53
66
  # POST /accepts.json
54
67
  def create
@@ -80,4 +93,29 @@ class AcceptsController < InheritedResources::Base
80
93
  end
81
94
  end
82
95
  end
96
+
97
+ # PUT /accepts/1
98
+ # PUT /accepts/1.json
99
+ def update
100
+ respond_to do |format|
101
+ if @accept.update_attributes(params[:accept])
102
+ format.html { redirect_to @accept, notice: t('controller.successfully_updated', model: t('activerecord.models.accept')) }
103
+ format.json { head :no_content }
104
+ else
105
+ format.html { render action: "edit" }
106
+ format.json { render json: @accept.errors, status: :unprocessable_entity }
107
+ end
108
+ end
109
+ end
110
+
111
+ # DELETE /accepts/1
112
+ # DELETE /accepts/1.json
113
+ def destroy
114
+ @accept.destroy
115
+
116
+ respond_to do |format|
117
+ format.html { redirect_to accepts_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.accept')) }
118
+ format.json { head :no_content }
119
+ end
120
+ end
83
121
  end
@@ -1,17 +1,83 @@
1
- class BookstoresController < InheritedResources::Base
2
- respond_to :html, :json
1
+ class BookstoresController < ApplicationController
3
2
  load_and_authorize_resource
3
+ # GET /bookstores
4
+ # GET /bookstores.json
5
+ def index
6
+ @bookstores = Bookstore.page(params[:page])
7
+
8
+ respond_to do |format|
9
+ format.html # index.html.erb
10
+ format.json { render json: @bookstores }
11
+ end
12
+ end
13
+
14
+ # GET /bookstores/1
15
+ # GET /bookstores/1.json
16
+ def show
17
+ respond_to do |format|
18
+ format.html # show.html.erb
19
+ format.json { render json: @bookstore }
20
+ end
21
+ end
22
+
23
+ # GET /bookstores/new
24
+ # GET /bookstores/new.json
25
+ def new
26
+ @bookstore = Bookstore.new
27
+
28
+ respond_to do |format|
29
+ format.html # new.html.erb
30
+ format.json { render json: @bookstore }
31
+ end
32
+ end
4
33
 
34
+ # GET /bookstores/1/edit
35
+ def edit
36
+ end
37
+
38
+ # POST /bookstores
39
+ # POST /bookstores.json
40
+ def create
41
+ @bookstore = Bookstore.new(params[:bookstore])
42
+
43
+ respond_to do |format|
44
+ if @bookstore.save
45
+ format.html { redirect_to @bookstore, notice: t('controller.successfully_created', model: t('activerecord.models.bookstore')) }
46
+ format.json { render json: @bookstore, status: :created, location: @bookstore }
47
+ else
48
+ format.html { render action: "new" }
49
+ format.json { render json: @bookstore.errors, status: :unprocessable_entity }
50
+ end
51
+ end
52
+ end
53
+
54
+ # PUT /bookstores/1
55
+ # PUT /bookstores/1.json
5
56
  def update
6
- @bookstore = Bookstore.find(params[:id])
7
57
  if params[:move]
8
58
  move_position(@bookstore, params[:move])
9
59
  return
10
60
  end
11
- update!
61
+
62
+ respond_to do |format|
63
+ if @bookstore.update_attributes(params[:bookstore])
64
+ format.html { redirect_to @bookstore, notice: t('controller.successfully_updated', model: t('activerecord.models.bookstore')) }
65
+ format.json { head :no_content }
66
+ else
67
+ format.html { render action: "edit" }
68
+ format.json { render json: @bookstore.errors, status: :unprocessable_entity }
69
+ end
70
+ end
12
71
  end
13
72
 
14
- def index
15
- @bookstores = Bookstore.page(params[:page])
73
+ # DELETE /bookstores/1
74
+ # DELETE /bookstores/1.json
75
+ def destroy
76
+ @bookstore.destroy
77
+
78
+ respond_to do |format|
79
+ format.html { redirect_to bookstores_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.bookstore')) }
80
+ format.json { head :no_content }
81
+ end
16
82
  end
17
83
  end
@@ -1,13 +1,83 @@
1
- class BudgetTypesController < InheritedResources::Base
2
- respond_to :html, :json
1
+ class BudgetTypesController < ApplicationController
3
2
  load_and_authorize_resource
3
+ # GET /budget_types
4
+ # GET /budget_types.json
5
+ def index
6
+ @budget_types = BudgetType.all
4
7
 
8
+ respond_to do |format|
9
+ format.html # index.html.erb
10
+ format.json { render json: @budget_types }
11
+ end
12
+ end
13
+
14
+ # GET /budget_types/1
15
+ # GET /budget_types/1.json
16
+ def show
17
+ respond_to do |format|
18
+ format.html # show.html.erb
19
+ format.json { render json: @budget_type }
20
+ end
21
+ end
22
+
23
+ # GET /budget_types/new
24
+ # GET /budget_types/new.json
25
+ def new
26
+ @budget_type = BudgetType.new
27
+
28
+ respond_to do |format|
29
+ format.html # new.html.erb
30
+ format.json { render json: @budget_type }
31
+ end
32
+ end
33
+
34
+ # GET /budget_types/1/edit
35
+ def edit
36
+ end
37
+
38
+ # POST /budget_types
39
+ # POST /budget_types.json
40
+ def create
41
+ @budget_type = BudgetType.new(params[:budget_type])
42
+
43
+ respond_to do |format|
44
+ if @budget_type.save
45
+ format.html { redirect_to @budget_type, notice: t('controller.successfully_created', model: t('activerecord.models.budget_type')) }
46
+ format.json { render json: @budget_type, status: :created, location: @budget_type }
47
+ else
48
+ format.html { render action: "new" }
49
+ format.json { render json: @budget_type.errors, status: :unprocessable_entity }
50
+ end
51
+ end
52
+ end
53
+
54
+ # PUT /budget_types/1
55
+ # PUT /budget_types/1.json
5
56
  def update
6
- @budget_type = BudgetType.find(params[:id])
7
57
  if params[:move]
8
58
  move_position(@budget_type, params[:move])
9
59
  return
10
60
  end
11
- update!
61
+
62
+ respond_to do |format|
63
+ if @budget_type.update_attributes(params[:budget_type])
64
+ format.html { redirect_to @budget_type, notice: t('controller.successfully_updated', model: t('activerecord.models.budget_type')) }
65
+ format.json { head :no_content }
66
+ else
67
+ format.html { render action: "edit" }
68
+ format.json { render json: @budget_type.errors, status: :unprocessable_entity }
69
+ end
70
+ end
71
+ end
72
+
73
+ # DELETE /budget_types/1
74
+ # DELETE /budget_types/1.json
75
+ def destroy
76
+ @budget_type.destroy
77
+
78
+ respond_to do |format|
79
+ format.html { redirect_to budget_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.budget_type')) }
80
+ format.json { head :no_content }
81
+ end
12
82
  end
13
83
  end
@@ -1,13 +1,83 @@
1
- class RequestStatusTypesController < InheritedResources::Base
2
- respond_to :html, :json
1
+ class RequestStatusTypesController < ApplicationController
3
2
  load_and_authorize_resource
3
+ # GET /request_status_types
4
+ # GET /request_status_types.json
5
+ def index
6
+ @request_status_types = RequestStatusType.all
4
7
 
8
+ respond_to do |format|
9
+ format.html # index.html.erb
10
+ format.json { render json: @request_status_types }
11
+ end
12
+ end
13
+
14
+ # GET /request_status_types/1
15
+ # GET /request_status_types/1.json
16
+ def show
17
+ respond_to do |format|
18
+ format.html # show.html.erb
19
+ format.json { render json: @request_status_type }
20
+ end
21
+ end
22
+
23
+ # GET /request_status_types/new
24
+ # GET /request_status_types/new.json
25
+ def new
26
+ @request_status_type = RequestStatusType.new
27
+
28
+ respond_to do |format|
29
+ format.html # new.html.erb
30
+ format.json { render json: @request_status_type }
31
+ end
32
+ end
33
+
34
+ # GET /request_status_types/1/edit
35
+ def edit
36
+ end
37
+
38
+ # POST /request_status_types
39
+ # POST /request_status_types.json
40
+ def create
41
+ @request_status_type = RequestStatusType.new(params[:request_status_type])
42
+
43
+ respond_to do |format|
44
+ if @request_status_type.save
45
+ format.html { redirect_to @request_status_type, notice: t('controller.successfully_created', model: t('activerecord.models.request_status_type')) }
46
+ format.json { render json: @request_status_type, status: :created, location: @request_status_type }
47
+ else
48
+ format.html { render action: "new" }
49
+ format.json { render json: @request_status_type.errors, status: :unprocessable_entity }
50
+ end
51
+ end
52
+ end
53
+
54
+ # PUT /request_status_types/1
55
+ # PUT /request_status_types/1.json
5
56
  def update
6
- @request_status_type = RequestStatusType.find(params[:id])
7
57
  if params[:move]
8
58
  move_position(@request_status_type, params[:move])
9
59
  return
10
60
  end
11
- update!
61
+
62
+ respond_to do |format|
63
+ if @request_status_type.update_attributes(params[:request_status_type])
64
+ format.html { redirect_to @request_status_type, notice: t('controller.successfully_updated', model: t('activerecord.models.request_status_type')) }
65
+ format.json { head :no_content }
66
+ else
67
+ format.html { render action: "edit" }
68
+ format.json { render json: @request_status_type.errors, status: :unprocessable_entity }
69
+ end
70
+ end
71
+ end
72
+
73
+ # DELETE /request_status_types/1
74
+ # DELETE /request_status_types/1.json
75
+ def destroy
76
+ @request_status_type.destroy
77
+
78
+ respond_to do |format|
79
+ format.html { redirect_to request_status_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.request_status_type')) }
80
+ format.json { head :no_content }
81
+ end
12
82
  end
13
83
  end
@@ -1,13 +1,83 @@
1
- class RequestTypesController < InheritedResources::Base
2
- respond_to :html, :json
1
+ class RequestTypesController < ApplicationController
3
2
  load_and_authorize_resource
3
+ # GET /request_types
4
+ # GET /request_types.json
5
+ def index
6
+ @request_types = RequestType.all
4
7
 
8
+ respond_to do |format|
9
+ format.html # index.html.erb
10
+ format.json { render json: @request_types }
11
+ end
12
+ end
13
+
14
+ # GET /request_types/1
15
+ # GET /request_types/1.json
16
+ def show
17
+ respond_to do |format|
18
+ format.html # show.html.erb
19
+ format.json { render json: @request_type }
20
+ end
21
+ end
22
+
23
+ # GET /request_types/new
24
+ # GET /request_types/new.json
25
+ def new
26
+ @request_type = RequestType.new
27
+
28
+ respond_to do |format|
29
+ format.html # new.html.erb
30
+ format.json { render json: @request_type }
31
+ end
32
+ end
33
+
34
+ # GET /request_types/1/edit
35
+ def edit
36
+ end
37
+
38
+ # POST /request_types
39
+ # POST /request_types.json
40
+ def create
41
+ @request_type = RequestType.new(params[:request_type])
42
+
43
+ respond_to do |format|
44
+ if @request_type.save
45
+ format.html { redirect_to @request_type, notice: t('controller.successfully_created', model: t('activerecord.models.request_type')) }
46
+ format.json { render json: @request_type, status: :created, location: @request_type }
47
+ else
48
+ format.html { render action: "new" }
49
+ format.json { render json: @request_type.errors, status: :unprocessable_entity }
50
+ end
51
+ end
52
+ end
53
+
54
+ # PUT /request_types/1
55
+ # PUT /request_types/1.json
5
56
  def update
6
- @request_type = RequestType.find(params[:id])
7
57
  if params[:move]
8
58
  move_position(@request_type, params[:move])
9
59
  return
10
60
  end
11
- update!
61
+
62
+ respond_to do |format|
63
+ if @request_type.update_attributes(params[:request_type])
64
+ format.html { redirect_to @request_type, notice: t('controller.successfully_updated', model: t('activerecord.models.request_type')) }
65
+ format.json { head :no_content }
66
+ else
67
+ format.html { render action: "edit" }
68
+ format.json { render json: @request_type.errors, status: :unprocessable_entity }
69
+ end
70
+ end
71
+ end
72
+
73
+ # DELETE /request_types/1
74
+ # DELETE /request_types/1.json
75
+ def destroy
76
+ @request_type.destroy
77
+
78
+ respond_to do |format|
79
+ format.html { redirect_to request_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.request_type')) }
80
+ format.json { head :no_content }
81
+ end
12
82
  end
13
83
  end
@@ -1,17 +1,83 @@
1
- class SearchEnginesController < InheritedResources::Base
2
- respond_to :html, :json
1
+ class SearchEnginesController < ApplicationController
3
2
  load_and_authorize_resource
3
+ # GET /search_engines
4
+ # GET /search_engines.json
5
+ def index
6
+ @search_engines = SearchEngine.all
7
+
8
+ respond_to do |format|
9
+ format.html # index.html.erb
10
+ format.json { render json: @search_engines }
11
+ end
12
+ end
13
+
14
+ # GET /search_engines/1
15
+ # GET /search_engines/1.json
16
+ def show
17
+ respond_to do |format|
18
+ format.html # show.html.erb
19
+ format.json { render json: @search_engine }
20
+ end
21
+ end
22
+
23
+ # GET /search_engines/new
24
+ # GET /search_engines/new.json
25
+ def new
26
+ @search_engine = SearchEngine.new
27
+
28
+ respond_to do |format|
29
+ format.html # new.html.erb
30
+ format.json { render json: @search_engine }
31
+ end
32
+ end
4
33
 
34
+ # GET /search_engines/1/edit
35
+ def edit
36
+ end
37
+
38
+ # POST /search_engines
39
+ # POST /search_engines.json
40
+ def create
41
+ @search_engine = SearchEngine.new(params[:search_engine])
42
+
43
+ respond_to do |format|
44
+ if @search_engine.save
45
+ format.html { redirect_to @search_engine, notice: t('controller.successfully_created', model: t('activerecord.models.search_engine')) }
46
+ format.json { render json: @search_engine, status: :created, location: @search_engine }
47
+ else
48
+ format.html { render action: "new" }
49
+ format.json { render json: @search_engine.errors, status: :unprocessable_entity }
50
+ end
51
+ end
52
+ end
53
+
54
+ # PUT /search_engines/1
55
+ # PUT /search_engines/1.json
5
56
  def update
6
- @search_engine = SearchEngine.find(params[:id])
7
57
  if params[:move]
8
58
  move_position(@search_engine, params[:move])
9
59
  return
10
60
  end
11
- update!
61
+
62
+ respond_to do |format|
63
+ if @search_engine.update_attributes(params[:search_engine])
64
+ format.html { redirect_to @search_engine, notice: t('controller.successfully_updated', model: t('activerecord.models.search_engine')) }
65
+ format.json { head :no_content }
66
+ else
67
+ format.html { render action: "edit" }
68
+ format.json { render json: @search_engine.errors, status: :unprocessable_entity }
69
+ end
70
+ end
12
71
  end
13
72
 
14
- def index
15
- @search_engines = SearchEngine.page(params[:page])
73
+ # DELETE /search_engines/1
74
+ # DELETE /search_engines/1.json
75
+ def destroy
76
+ @search_engine.destroy
77
+
78
+ respond_to do |format|
79
+ format.html { redirect_to search_engines_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.search_engine')) }
80
+ format.json { head :no_content }
81
+ end
16
82
  end
17
83
  end
@@ -1,7 +1,7 @@
1
1
  <div style="color: red"><%= flash[:message] -%></div>
2
2
 
3
3
  <div class="search_form">
4
- <%= form_for(:accept, url: basket_accepts_path(@basket), remote: true) do |f| %>
4
+ <%= form_for(:accept, url: accepts_path(basket_id: @basket.id), remote: true) do |f| %>
5
5
  <%= f.error_messages %>
6
6
  <p>
7
7
  <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
@@ -57,6 +57,7 @@
57
57
  <%- end -%>
58
58
  </div>
59
59
  <div id="tab3">
60
+ <p><%= link_to t('shelf.update_display_order'), shelves_path(library_id: @library.name) %>
60
61
  <table class="table table-striped index">
61
62
  <tr>
62
63
  <th><%= t('activerecord.models.shelf') -%></th>
@@ -66,7 +67,7 @@
66
67
  <%- @library.shelves.each do |shelf| -%>
67
68
  <tr class="line<%= cycle("0", "1") -%>">
68
69
  <td>
69
- <%= link_to shelf.display_name.localize, shelf_path(shelf, library_id: @library.id) -%>
70
+ <%= link_to shelf.display_name.localize, shelf_path(shelf, library_id: @library.name) -%>
70
71
  <%- shelf.picture_files.each do |picture_file| -%>
71
72
  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "shelf_#{h(shelf.id)}" -%>
72
73
  <%- end -%>
@@ -0,0 +1,54 @@
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
+ <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
3
+ <div id="content_list">
4
+ <p id="notice"><%= notice %></p>
5
+
6
+ <h2 class="resource_title"><%= link_to shelf.display_name.localize, shelf -%></h2>
7
+
8
+ <table class="table table-striped index">
9
+ <tr>
10
+ <th id="position"></th>
11
+ <th><%= t('page.attachable') -%></th>
12
+ <th><%= t('activerecord.attributes.picture_file.picture_file_size') -%></th>
13
+ <th><%= t('activerecord.attributes.picture_file.picture_content_type') -%></th>
14
+ <th><%= t('activerecord.attributes.picture_file.picture_file_name') -%></th>
15
+ <th></th>
16
+ </tr>
17
+ <%- @picture_files.each do |picture_file| -%>
18
+ <tr class="line<%= cycle("0", "1") -%>">
19
+ <td>
20
+ <%- if can? :update, picture_file -%>
21
+ <%= move_position(picture_file) -%>
22
+ <%- end -%>
23
+ </td>
24
+ <td>
25
+ <%= link_to "#{h(picture_file.picture_attachable_type)}/#{h(picture_file.picture_attachable_id)}", picture_file.picture_attachable if picture_file.picture_attachable -%>
26
+ </td>
27
+ <td><%= picture_file.picture_file_size -%></td>
28
+ <td><%= picture_file.picture_content_type -%></td>
29
+ <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
30
+ <td>
31
+ <%= link_to t('page.show'), picture_file -%>
32
+ <%- if can? :update, picture_file -%>
33
+ <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
34
+ <% end %>
35
+ <%- if can? :delete, picture_file -%>
36
+ <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
37
+ <%- end -%>
38
+ </td>
39
+ </tr>
40
+ <%- end -%>
41
+ </table>
42
+
43
+ <%= paginate(@picture_files) -%>
44
+ </div>
45
+ </div>
46
+
47
+ <div id="submenu" class="ui-corner-all ui-widget-content">
48
+ <%- if can? :create, PictureFile -%>
49
+ <ul>
50
+ <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(shelf_id: shelf.id) -%></li>
51
+ <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>
52
+ </ul>
53
+ <%- end -%>
54
+ </div>
@@ -96,3 +96,11 @@ en:
96
96
  additional_param: Additional param
97
97
  note: Note
98
98
  position: Position
99
+
100
+ library:
101
+ map: "Map"
102
+ staff: "Staff"
103
+ number_of_item: "Number of items"
104
+ address: "Address"
105
+ shelf:
106
+ update_display_order: Update display order
@@ -3,7 +3,7 @@ ja:
3
3
  models:
4
4
  library: 図書館
5
5
  library_group: 図書館全体の設定
6
- shelf: 書棚
6
+ shelf: 本棚
7
7
  accept: 検収
8
8
  budget_type: 予算種別
9
9
  bookstore: 書店
@@ -96,3 +96,11 @@ ja:
96
96
  additional_param: 追加のパラメータ
97
97
  note: 注記
98
98
  position: 位置
99
+
100
+ library:
101
+ map: "地図"
102
+ staff: "職員"
103
+ number_of_item: "所蔵冊数"
104
+ address: "住所"
105
+ shelf:
106
+ update_display_order: "表示順序を変更する"
@@ -1,14 +1,8 @@
1
1
  Rails.application.routes.draw do
2
- resources :libraries do
3
- resources :shelves
4
- end
5
- resources :shelves do
6
- resources :picture_files
7
- end
2
+ resources :libraries
3
+ resources :shelves
8
4
 
9
- resources :baskets do
10
- resources :accepts, :except => [:edit, :update]
11
- end
5
+ resources :baskets
12
6
  resources :accepts, :except => [:edit, :update]
13
7
 
14
8
  resources :bookstores
@@ -1,5 +1,4 @@
1
1
  require 'enju_seed'
2
- require 'inherited_resources'
3
2
  require 'geocoder'
4
3
  require 'ipaddr'
5
4
 
@@ -1,3 +1,3 @@
1
1
  module EnjuLibrary
2
- VERSION = "0.1.0.pre35"
2
+ VERSION = "0.1.0.pre36"
3
3
  end
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_library
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre35
4
+ version: 0.1.0.pre36
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-16 00:00:00.000000000 Z
11
+ date: 2014-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_seed
@@ -24,20 +24,6 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.1.1.pre10
27
- - !ruby/object:Gem::Dependency
28
- name: inherited_resources
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: geocoder
43
29
  requirement: !ruby/object:Gem::Requirement
@@ -142,14 +128,14 @@ dependencies:
142
128
  requirements:
143
129
  - - "~>"
144
130
  - !ruby/object:Gem::Version
145
- version: 1.1.0.rc13
131
+ version: 1.1.0.rc14
146
132
  type: :development
147
133
  prerelease: false
148
134
  version_requirements: !ruby/object:Gem::Requirement
149
135
  requirements:
150
136
  - - "~>"
151
137
  - !ruby/object:Gem::Version
152
- version: 1.1.0.rc13
138
+ version: 1.1.0.rc14
153
139
  - !ruby/object:Gem::Dependency
154
140
  name: enju_ndl
155
141
  requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ dependencies:
170
156
  requirements:
171
157
  - - "~>"
172
158
  - !ruby/object:Gem::Version
173
- version: 0.1.0.pre13
159
+ version: 0.1.0.pre14
174
160
  type: :development
175
161
  prerelease: false
176
162
  version_requirements: !ruby/object:Gem::Requirement
177
163
  requirements:
178
164
  - - "~>"
179
165
  - !ruby/object:Gem::Version
180
- version: 0.1.0.pre13
166
+ version: 0.1.0.pre14
181
167
  - !ruby/object:Gem::Dependency
182
168
  name: enju_biblio
183
169
  requirement: !ruby/object:Gem::Requirement
@@ -198,42 +184,42 @@ dependencies:
198
184
  requirements:
199
185
  - - "~>"
200
186
  - !ruby/object:Gem::Version
201
- version: 0.1.17.pre19
187
+ version: 0.1.17.pre20
202
188
  type: :development
203
189
  prerelease: false
204
190
  version_requirements: !ruby/object:Gem::Requirement
205
191
  requirements:
206
192
  - - "~>"
207
193
  - !ruby/object:Gem::Version
208
- version: 0.1.17.pre19
194
+ version: 0.1.17.pre20
209
195
  - !ruby/object:Gem::Dependency
210
196
  name: enju_circulation
211
197
  requirement: !ruby/object:Gem::Requirement
212
198
  requirements:
213
199
  - - "~>"
214
200
  - !ruby/object:Gem::Version
215
- version: 0.1.0.pre37
201
+ version: 0.1.0.pre38
216
202
  type: :development
217
203
  prerelease: false
218
204
  version_requirements: !ruby/object:Gem::Requirement
219
205
  requirements:
220
206
  - - "~>"
221
207
  - !ruby/object:Gem::Version
222
- version: 0.1.0.pre37
208
+ version: 0.1.0.pre38
223
209
  - !ruby/object:Gem::Dependency
224
210
  name: enju_inter_library_loan
225
211
  requirement: !ruby/object:Gem::Requirement
226
212
  requirements:
227
213
  - - "~>"
228
214
  - !ruby/object:Gem::Version
229
- version: 0.1.0.pre8
215
+ version: 0.1.0.pre10
230
216
  type: :development
231
217
  prerelease: false
232
218
  version_requirements: !ruby/object:Gem::Requirement
233
219
  requirements:
234
220
  - - "~>"
235
221
  - !ruby/object:Gem::Version
236
- version: 0.1.0.pre8
222
+ version: 0.1.0.pre10
237
223
  - !ruby/object:Gem::Dependency
238
224
  name: sunspot_solr
239
225
  requirement: !ruby/object:Gem::Requirement
@@ -404,6 +390,7 @@ files:
404
390
  - app/views/library_groups/index.html.erb
405
391
  - app/views/library_groups/new.html.erb
406
392
  - app/views/library_groups/show.html.erb
393
+ - app/views/picture_files/_index_shelf.html.erb
407
394
  - app/views/request_status_types/_form.html.erb
408
395
  - app/views/request_status_types/edit.html.erb
409
396
  - app/views/request_status_types/index.html.erb
@@ -688,28 +675,28 @@ files:
688
675
  - spec/dummy/solr/conf/spellings.txt
689
676
  - spec/dummy/solr/conf/stopwords.txt
690
677
  - spec/dummy/solr/conf/synonyms.txt
691
- - spec/dummy/solr/default/data/index/_1vz.fdt
692
- - spec/dummy/solr/default/data/index/_1vz.fdx
693
- - spec/dummy/solr/default/data/index/_1vz.fnm
694
- - spec/dummy/solr/default/data/index/_1vz.nvd
695
- - spec/dummy/solr/default/data/index/_1vz.nvm
696
- - spec/dummy/solr/default/data/index/_1vz.si
697
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.doc
698
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.pos
699
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tim
700
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tip
678
+ - spec/dummy/solr/default/data/index/_1we.fdt
679
+ - spec/dummy/solr/default/data/index/_1we.fdx
680
+ - spec/dummy/solr/default/data/index/_1we.fnm
681
+ - spec/dummy/solr/default/data/index/_1we.nvd
682
+ - spec/dummy/solr/default/data/index/_1we.nvm
683
+ - spec/dummy/solr/default/data/index/_1we.si
684
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.doc
685
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.pos
686
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.tim
687
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.tip
701
688
  - spec/dummy/solr/default/data/index/segments.gen
702
- - spec/dummy/solr/default/data/index/segments_36s
703
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004121
704
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004122
705
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004123
706
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004124
707
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004125
708
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004126
709
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004127
710
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004128
711
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004129
712
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004130
689
+ - spec/dummy/solr/default/data/index/segments_37q
690
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004155
691
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004156
692
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004157
693
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004158
694
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004159
695
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004160
696
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004161
697
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004162
698
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004163
699
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004164
713
700
  - spec/dummy/solr/development/data/index/segments.gen
714
701
  - spec/dummy/solr/development/data/index/segments_1
715
702
  - spec/dummy/solr/solr.xml
@@ -1138,28 +1125,28 @@ test_files:
1138
1125
  - spec/dummy/solr/conf/spellings.txt
1139
1126
  - spec/dummy/solr/conf/stopwords.txt
1140
1127
  - spec/dummy/solr/conf/synonyms.txt
1141
- - spec/dummy/solr/default/data/index/_1vz.fdt
1142
- - spec/dummy/solr/default/data/index/_1vz.fdx
1143
- - spec/dummy/solr/default/data/index/_1vz.fnm
1144
- - spec/dummy/solr/default/data/index/_1vz.nvd
1145
- - spec/dummy/solr/default/data/index/_1vz.nvm
1146
- - spec/dummy/solr/default/data/index/_1vz.si
1147
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.doc
1148
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.pos
1149
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tim
1150
- - spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tip
1128
+ - spec/dummy/solr/default/data/index/_1we.fdt
1129
+ - spec/dummy/solr/default/data/index/_1we.fdx
1130
+ - spec/dummy/solr/default/data/index/_1we.fnm
1131
+ - spec/dummy/solr/default/data/index/_1we.nvd
1132
+ - spec/dummy/solr/default/data/index/_1we.nvm
1133
+ - spec/dummy/solr/default/data/index/_1we.si
1134
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.doc
1135
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.pos
1136
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.tim
1137
+ - spec/dummy/solr/default/data/index/_1we_Lucene41_0.tip
1151
1138
  - spec/dummy/solr/default/data/index/segments.gen
1152
- - spec/dummy/solr/default/data/index/segments_36s
1153
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004121
1154
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004122
1155
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004123
1156
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004124
1157
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004125
1158
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004126
1159
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004127
1160
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004128
1161
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004129
1162
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000004130
1139
+ - spec/dummy/solr/default/data/index/segments_37q
1140
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004155
1141
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004156
1142
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004157
1143
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004158
1144
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004159
1145
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004160
1146
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004161
1147
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004162
1148
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004163
1149
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000004164
1163
1150
  - spec/dummy/solr/development/data/index/segments.gen
1164
1151
  - spec/dummy/solr/development/data/index/segments_1
1165
1152
  - spec/dummy/solr/solr.xml