enju_leaf 1.2.0.beta.1 → 1.2.0.beta.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (167) hide show
  1. checksums.yaml +4 -4
  2. data/lib/enju_leaf/engine.rb +1 -15
  3. data/lib/enju_leaf/version.rb +1 -1
  4. data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb +3 -3
  5. data/lib/generators/enju_leaf/setup/setup_generator.rb +0 -1
  6. data/spec/controllers/page_controller_spec.rb +1 -1
  7. data/spec/dummy/app/controllers/application_controller.rb +0 -1
  8. data/spec/dummy/app/helpers/application_helper.rb +2 -1
  9. data/spec/dummy/app/models/user.rb +0 -1
  10. data/spec/dummy/config/application.rb +1 -2
  11. data/{db → spec/dummy/db}/migrate/041_create_roles.rb +0 -0
  12. data/spec/dummy/db/migrate/059_create_libraries.rb +1 -5
  13. data/spec/dummy/db/migrate/069_create_shelves.rb +1 -5
  14. data/{db → spec/dummy/db}/migrate/077_create_user_groups.rb +0 -0
  15. data/spec/dummy/db/migrate/130_create_request_status_types.rb +1 -5
  16. data/spec/dummy/db/migrate/131_create_request_types.rb +1 -5
  17. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +9 -0
  18. data/{db → spec/dummy/db}/migrate/20100606065209_create_user_has_roles.rb +0 -0
  19. data/{db → spec/dummy/db}/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +0 -0
  20. data/spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb +6 -0
  21. data/{db → spec/dummy/db}/migrate/20130221154434_add_additional_attributes_to_user.rb +0 -0
  22. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +6 -0
  23. data/{db → spec/dummy/db}/migrate/20140110122216_create_user_import_files.rb +0 -0
  24. data/{db → spec/dummy/db}/migrate/20140110131010_create_user_import_results.rb +0 -0
  25. data/{db → spec/dummy/db}/migrate/20140122054321_create_profiles.rb +0 -0
  26. data/{db → spec/dummy/db}/migrate/20140524074813_create_user_import_file_transitions.rb +0 -0
  27. data/{db → spec/dummy/db}/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +0 -0
  28. data/{db → spec/dummy/db}/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +0 -0
  29. data/{db → spec/dummy/db}/migrate/20140709113413_create_user_export_files.rb +0 -0
  30. data/{db → spec/dummy/db}/migrate/20140709113905_create_user_export_file_transitions.rb +0 -0
  31. data/{db → spec/dummy/db}/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +0 -0
  32. data/{db → spec/dummy/db}/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +0 -0
  33. data/{db → spec/dummy/db}/migrate/20140811031145_add_expired_at_to_profile.rb +0 -0
  34. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +14 -0
  35. data/{db → spec/dummy/db}/migrate/20141003181336_add_full_name_transcription_to_profile.rb +0 -0
  36. data/{db → spec/dummy/db}/migrate/20141003182825_add_date_of_birth_to_profile.rb +0 -0
  37. data/spec/dummy/db/migrate/20141020120523_add_library_id_to_checkout.rb +6 -0
  38. data/spec/dummy/db/migrate/20150106001709_create_demands.rb +14 -0
  39. data/{db → spec/dummy/db}/migrate/20150421023923_create_identities.rb +0 -0
  40. data/{db → spec/dummy/db}/migrate/20150506105356_add_error_message_to_user_import_result.rb +0 -0
  41. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +13 -0
  42. data/{db → spec/dummy/db}/migrate/20151126005552_add_provider_to_identity.rb +0 -0
  43. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +5 -0
  44. data/{db → spec/dummy/db}/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +0 -0
  45. data/{db → spec/dummy/db}/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +0 -0
  46. data/spec/dummy/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +9 -0
  47. data/spec/dummy/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +9 -0
  48. data/spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +9 -0
  49. data/spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +9 -0
  50. data/spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +9 -0
  51. data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +9 -0
  52. data/spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +5 -0
  53. data/spec/dummy/db/schema.rb +47 -12
  54. data/spec/fixtures/library_groups.yml +1 -4
  55. data/spec/models/user_spec.rb +0 -22
  56. data/spec/rails_helper.rb +1 -1
  57. data/spec/views/page/index.html.erb_spec.rb +0 -2
  58. metadata +96 -337
  59. data/app/controllers/concerns/enju_leaf/controller.rb +0 -225
  60. data/app/controllers/my_accounts_controller.rb +0 -93
  61. data/app/controllers/names_controller.rb +0 -60
  62. data/app/controllers/profiles_controller.rb +0 -219
  63. data/app/controllers/roles_controller.rb +0 -61
  64. data/app/controllers/user_export_files_controller.rb +0 -116
  65. data/app/controllers/user_groups_controller.rb +0 -118
  66. data/app/controllers/user_import_files_controller.rb +0 -129
  67. data/app/controllers/user_import_results_controller.rb +0 -57
  68. data/app/mailers/notifier.rb +0 -30
  69. data/app/models/identity.rb +0 -9
  70. data/app/models/profile.rb +0 -101
  71. data/app/models/role.rb +0 -50
  72. data/app/models/user_export_file.rb +0 -67
  73. data/app/models/user_export_file_state_machine.rb +0 -15
  74. data/app/models/user_export_file_transition.rb +0 -20
  75. data/app/models/user_group.rb +0 -29
  76. data/app/models/user_has_role.rb +0 -19
  77. data/app/models/user_import_file.rb +0 -352
  78. data/app/models/user_import_file_state_machine.rb +0 -19
  79. data/app/models/user_import_file_transition.rb +0 -20
  80. data/app/models/user_import_result.rb +0 -20
  81. data/app/policies/application_policy.rb +0 -53
  82. data/app/policies/name_policy.rb +0 -21
  83. data/app/policies/profile_policy.rb +0 -55
  84. data/app/policies/role_policy.rb +0 -21
  85. data/app/policies/user_export_file_policy.rb +0 -21
  86. data/app/policies/user_group_policy.rb +0 -22
  87. data/app/policies/user_import_file_policy.rb +0 -21
  88. data/app/policies/user_import_result_policy.rb +0 -21
  89. data/app/views/my_accounts/_edit_credential.html.erb +0 -99
  90. data/app/views/my_accounts/_form.html.erb +0 -24
  91. data/app/views/my_accounts/_show.html.erb +0 -1
  92. data/app/views/my_accounts/edit.html.erb +0 -32
  93. data/app/views/my_accounts/show.html+phone.erb +0 -1
  94. data/app/views/my_accounts/show.html.erb +0 -49
  95. data/app/views/names/_form.html.erb +0 -41
  96. data/app/views/names/edit.html.erb +0 -6
  97. data/app/views/names/index.html.erb +0 -37
  98. data/app/views/names/new.html.erb +0 -5
  99. data/app/views/names/show.html.erb +0 -34
  100. data/app/views/profiles/_edit_credential.html.erb +0 -88
  101. data/app/views/profiles/_edit_profile.html.erb +0 -42
  102. data/app/views/profiles/_form.html.erb +0 -15
  103. data/app/views/profiles/_show.html.erb +0 -1
  104. data/app/views/profiles/edit.html.erb +0 -33
  105. data/app/views/profiles/index.html.erb +0 -70
  106. data/app/views/profiles/new.html.erb +0 -88
  107. data/app/views/profiles/show.html+phone.erb +0 -1
  108. data/app/views/profiles/show.html.erb +0 -71
  109. data/app/views/roles/_form.html.erb +0 -19
  110. data/app/views/roles/edit.html.erb +0 -13
  111. data/app/views/roles/index.html.erb +0 -32
  112. data/app/views/roles/new.html.erb +0 -12
  113. data/app/views/roles/show.html.erb +0 -46
  114. data/app/views/user_export_files/_form.html.erb +0 -12
  115. data/app/views/user_export_files/edit.html.erb +0 -6
  116. data/app/views/user_export_files/index.html.erb +0 -44
  117. data/app/views/user_export_files/new.html.erb +0 -16
  118. data/app/views/user_export_files/show.html.erb +0 -36
  119. data/app/views/user_groups/_form.html.erb +0 -40
  120. data/app/views/user_groups/edit.html.erb +0 -13
  121. data/app/views/user_groups/index.html.erb +0 -51
  122. data/app/views/user_groups/new.html.erb +0 -12
  123. data/app/views/user_groups/show.html.erb +0 -68
  124. data/app/views/user_import_files/_form.html.erb +0 -61
  125. data/app/views/user_import_files/_results.html.erb +0 -22
  126. data/app/views/user_import_files/edit.html.erb +0 -6
  127. data/app/views/user_import_files/index.html.erb +0 -45
  128. data/app/views/user_import_files/new.html.erb +0 -60
  129. data/app/views/user_import_files/show.html.erb +0 -85
  130. data/app/views/user_import_results/_form.html.erb +0 -29
  131. data/app/views/user_import_results/_list.html.erb +0 -22
  132. data/app/views/user_import_results/_list_lines.html.erb +0 -24
  133. data/app/views/user_import_results/index.html.erb +0 -25
  134. data/app/views/user_import_results/index.txt.erb +0 -3
  135. data/app/views/user_import_results/show.html.erb +0 -33
  136. data/db/migrate/20091202124834_create_versions.rb +0 -18
  137. data/spec/controllers/my_accounts_controller_spec.rb +0 -229
  138. data/spec/controllers/profiles_controller_spec.rb +0 -594
  139. data/spec/controllers/roles_controller_spec.rb +0 -136
  140. data/spec/controllers/user_export_files_controller_spec.rb +0 -296
  141. data/spec/controllers/user_groups_controller_spec.rb +0 -443
  142. data/spec/controllers/user_import_files_controller_spec.rb +0 -305
  143. data/spec/controllers/user_import_results_controller_spec.rb +0 -157
  144. data/spec/fixtures/user_export_files.yml +0 -25
  145. data/spec/fixtures/user_import_files.yml +0 -51
  146. data/spec/fixtures/user_import_results.yml +0 -26
  147. data/spec/fixtures/user_reserve_stats.yml +0 -27
  148. data/spec/models/basket_spec.rb +0 -23
  149. data/spec/models/profile_spec.rb +0 -98
  150. data/spec/models/role_spec.rb +0 -40
  151. data/spec/models/user_export_file_spec.rb +0 -30
  152. data/spec/models/user_group_spec.rb +0 -37
  153. data/spec/models/user_has_role_spec.rb +0 -18
  154. data/spec/models/user_import_file_spec.rb +0 -220
  155. data/spec/models/user_import_result_spec.rb +0 -20
  156. data/spec/requests/profiles_spec.rb +0 -9
  157. data/spec/routing/profiles_routing_spec.rb +0 -35
  158. data/spec/routing/resource_import_files_routing_spec.rb +0 -35
  159. data/spec/routing/roles_routing_spec.rb +0 -35
  160. data/spec/routing/users_spec.rb +0 -14
  161. data/spec/views/my_accounts/show.html.erb_spec.rb +0 -43
  162. data/spec/views/profiles/edit.html.erb_spec.rb +0 -42
  163. data/spec/views/profiles/index.html.erb_spec.rb +0 -19
  164. data/spec/views/profiles/new.html.erb_spec.rb +0 -25
  165. data/spec/views/profiles/show.html.erb_spec.rb +0 -31
  166. data/spec/views/user_export_files/new.html.erb_spec.rb +0 -19
  167. data/spec/views/user_import_results/index.html.erb_spec.rb +0 -29
@@ -1,19 +0,0 @@
1
- class UserImportFileStateMachine
2
- include Statesman::Machine
3
-
4
- state :pending, initial: true
5
- state :started
6
- state :completed
7
- state :failed
8
-
9
- transition from: :pending, to: :started
10
- transition from: :started, to: [:completed, :failed]
11
-
12
- after_transition(from: :pending, to: :started) do |user_import_file|
13
- user_import_file.update_column(:executed_at, Time.zone.now)
14
- end
15
-
16
- before_transition(from: :started, to: :completed) do |user_import_file|
17
- user_import_file.error_message = nil
18
- end
19
- end
@@ -1,20 +0,0 @@
1
- class UserImportFileTransition < ActiveRecord::Base
2
- include Statesman::Adapters::ActiveRecordTransition
3
-
4
-
5
- belongs_to :user_import_file, inverse_of: :user_import_file_transitions
6
- #attr_accessible :to_state, :sort_key, :metadata
7
- end
8
-
9
- # == Schema Information
10
- #
11
- # Table name: user_import_file_transitions
12
- #
13
- # id :integer not null, primary key
14
- # to_state :string
15
- # metadata :text default({})
16
- # sort_key :integer
17
- # user_import_file_id :integer
18
- # created_at :datetime
19
- # updated_at :datetime
20
- #
@@ -1,20 +0,0 @@
1
- class UserImportResult < ActiveRecord::Base
2
- scope :file_id, proc{ |file_id| where(user_import_file_id: file_id) }
3
- scope :failed, -> { where(user_id: nil) }
4
-
5
- belongs_to :user_import_file
6
- belongs_to :user
7
- end
8
-
9
- # == Schema Information
10
- #
11
- # Table name: user_import_results
12
- #
13
- # id :integer not null, primary key
14
- # user_import_file_id :integer
15
- # user_id :integer
16
- # body :text
17
- # created_at :datetime
18
- # updated_at :datetime
19
- # error_message :text
20
- #
@@ -1,53 +0,0 @@
1
- class ApplicationPolicy
2
- attr_reader :user, :record
3
-
4
- def initialize(user, record)
5
- @user = user
6
- @record = record
7
- end
8
-
9
- def index?
10
- false
11
- end
12
-
13
- def show?
14
- scope.where(id: record.id).exists?
15
- end
16
-
17
- def create?
18
- false
19
- end
20
-
21
- def new?
22
- create?
23
- end
24
-
25
- def update?
26
- false
27
- end
28
-
29
- def edit?
30
- update?
31
- end
32
-
33
- def destroy?
34
- false
35
- end
36
-
37
- def scope
38
- Pundit.policy_scope!(user, record.class)
39
- end
40
-
41
- class Scope
42
- attr_reader :user, :scope
43
-
44
- def initialize(user, scope)
45
- @user = user
46
- @scope = scope
47
- end
48
-
49
- def resolve
50
- scope
51
- end
52
- end
53
- end
@@ -1,21 +0,0 @@
1
- class NamePolicy < ApplicationPolicy
2
- def index?
3
- true
4
- end
5
-
6
- def show?
7
- true
8
- end
9
-
10
- def create?
11
- true if user.try(:has_role?, 'Librarian')
12
- end
13
-
14
- def update?
15
- true if user.try(:has_role?, 'Librarian')
16
- end
17
-
18
- def destroy?
19
- true if user.try(:has_role?, 'Librarian')
20
- end
21
- end
@@ -1,55 +0,0 @@
1
- class ProfilePolicy < ApplicationPolicy
2
- def index?
3
- true if user.try(:has_role?, 'Librarian')
4
- end
5
-
6
- def show?
7
- case user.try(:role).try(:name)
8
- when 'Administrator'
9
- true
10
- when 'Librarian'
11
- return true if record == user.profile
12
- true if %w(Librarian User Guest).include?(record.required_role.name)
13
- when 'User'
14
- return true if record == user.profile
15
- true if %w(User Guest).include?(record.required_role.name)
16
- end
17
- end
18
-
19
- def create?
20
- true if user.try(:has_role?, 'Librarian')
21
- end
22
-
23
- def update?
24
- case user.try(:role).try(:name)
25
- when 'Administrator'
26
- true
27
- when 'Librarian'
28
- unless record.user.try(:has_role?, 'Administrator')
29
- true if %w(User Guest Librarian).include?(record.required_role.name)
30
- end
31
- when 'User'
32
- return true if record == user.profile
33
- end
34
- end
35
-
36
- def destroy?
37
- return false unless user
38
- return false unless user.try(:has_role?, 'Librarian')
39
- if record.user
40
- if record != user.profile && record.user.id != 1
41
- if defined?(EnjuCirculation)
42
- if record.user.checkouts.not_returned.empty?
43
- true if record.user.deletable_by?(user)
44
- end
45
- else
46
- true if record.user.deletable_by?(user)
47
- end
48
- else
49
- false
50
- end
51
- else
52
- true
53
- end
54
- end
55
- end
@@ -1,21 +0,0 @@
1
- class RolePolicy < ApplicationPolicy
2
- def index?
3
- true if user.try(:has_role?, 'Librarian')
4
- end
5
-
6
- def show?
7
- true if user.try(:has_role?, 'Librarian')
8
- end
9
-
10
- def create?
11
- false
12
- end
13
-
14
- def update?
15
- true if user.try(:has_role?, 'Administrator')
16
- end
17
-
18
- def destroy?
19
- false
20
- end
21
- end
@@ -1,21 +0,0 @@
1
- class UserExportFilePolicy < ApplicationPolicy
2
- def index?
3
- true if user.try(:has_role?, 'Administrator')
4
- end
5
-
6
- def show?
7
- true if user.try(:has_role?, 'Administrator')
8
- end
9
-
10
- def create?
11
- true if user.try(:has_role?, 'Administrator')
12
- end
13
-
14
- def update?
15
- true if user.try(:has_role?, 'Administrator')
16
- end
17
-
18
- def destroy?
19
- true if user.try(:has_role?, 'Administrator')
20
- end
21
- end
@@ -1,22 +0,0 @@
1
- class UserGroupPolicy < ApplicationPolicy
2
- def index?
3
- true
4
- end
5
-
6
- def show?
7
- true
8
- end
9
-
10
- def create?
11
- true if user.try(:has_role?, 'Administrator')
12
- end
13
-
14
- def update?
15
- true if user.try(:has_role?, 'Administrator')
16
- end
17
-
18
- def destroy?
19
- return false unless record.profiles.empty?
20
- user.try(:has_role?, 'Administrator')
21
- end
22
- end
@@ -1,21 +0,0 @@
1
- class UserImportFilePolicy < ApplicationPolicy
2
- def index?
3
- true if user.try(:has_role?, 'Librarian')
4
- end
5
-
6
- def show?
7
- true if user.try(:has_role?, 'Librarian')
8
- end
9
-
10
- def create?
11
- true if user.try(:has_role?, 'Librarian')
12
- end
13
-
14
- def update?
15
- true if user.try(:has_role?, 'Librarian')
16
- end
17
-
18
- def destroy?
19
- true if user.try(:has_role?, 'Librarian')
20
- end
21
- end
@@ -1,21 +0,0 @@
1
- class UserImportResultPolicy < ApplicationPolicy
2
- def index?
3
- true if user.try(:has_role?, 'Librarian')
4
- end
5
-
6
- def show?
7
- true if user.try(:has_role?, 'Librarian')
8
- end
9
-
10
- def create?
11
- false
12
- end
13
-
14
- def update?
15
- false
16
- end
17
-
18
- def destroy?
19
- false
20
- end
21
- end
@@ -1,99 +0,0 @@
1
- <%= f.fields_for :user do |user_form| %>
2
- <div id="left_pane_detail">
3
-
4
- <div class="field">
5
- <%= user_form.label :username -%><br />
6
- <%= profile.user.username -%>
7
- </div>
8
-
9
- <div class="field">
10
- <%= user_form.label :email -%><br />
11
- <%= user_form.text_field :email %>
12
- </div>
13
-
14
- <% unless profile.user == current_user %>
15
- <div class="field">
16
- <%= user_form.label :auto_generated_password -%>
17
- <%= user_form.check_box :auto_generated_password -%>
18
- </div>
19
- <% end %>
20
-
21
- <div class="field">
22
- <%= f.label :expired_at -%><br />
23
- <%- if current_user.has_role?('Librarian') -%>
24
- <%= f.text_field :expired_at, value: profile.expired_at.try(:strftime, "%Y-%m-%d"), class: 'date_text_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
25
- <%- else -%>
26
- <%= l(profile.expired_at) if profile.expired_at -%>
27
- <%- end -%>
28
- </div>
29
-
30
- <div class="field">
31
- <%= user_form.label :locked -%>
32
- <%= user_form.check_box :locked, disabled: 'disabled' -%>
33
- </div>
34
-
35
- <div class="field">
36
- <%= user_form.label t('activerecord.models.role') -%><br />
37
- <%= user_form.fields_for :user_has_role do |u| %>
38
- <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
39
- <%= u.select :role_id, @roles.collect{|r| [r.display_name.localize, r.id]} %>
40
- <% else %>
41
- <%= current_user.role.display_name.localize -%>
42
- <% end %>
43
- <% end %>
44
- </div>
45
- </div>
46
-
47
- <div id="right_pane_detail">
48
- <div class="field">
49
- <%= f.label :full_name -%><br />
50
- <%= f.text_field :full_name -%>
51
- </div>
52
-
53
- <div class="field">
54
- <%= f.label :full_name_transcription -%><br />
55
- <%= f.text_field :full_name_transcription -%>
56
- </div>
57
-
58
- <div class="field">
59
- <%= f.label t('activerecord.models.user_group') -%><br />
60
- <%- if current_user.has_role?('Librarian') -%>
61
- <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
62
- <%- else -%>
63
- <%= current_user.profile.user_group.display_name.localize if current_user.profile.user_group -%>
64
- <%- end -%>
65
- </div>
66
-
67
- <div class="field">
68
- <%= f.label :user_number -%><br />
69
- <%- if current_user.has_role?('Librarian') -%>
70
- <%= f.text_field :user_number, class: 'resource_user_number' -%>
71
- <%- else -%>
72
- <%= profile.user_number -%>
73
- <%- end -%>
74
- </div>
75
-
76
- <div class="field">
77
- <%= f.label t('activerecord.models.library') -%><br />
78
- <%- if current_user.has_role?('Librarian') -%>
79
- <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
80
- <% else %>
81
- <%= current_user.profile.library.display_name.localize if current_user.profile.library %>
82
- <% end %>
83
- </div>
84
-
85
- <div class="field">
86
- <%= f.label t('role.required_role') -%><br />
87
- <%- if current_user.has_role?('Librarian') -%>
88
- <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
89
- <%- else -%>
90
- <%= current_user.role.display_name.localize -%>
91
- <%- end -%>
92
- </div>
93
-
94
- <div class="field">
95
- <%= f.label :locale -%><br />
96
- <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
97
- </div>
98
- </div>
99
- <% end %>
@@ -1,24 +0,0 @@
1
- <%= form_for(@user) do |f| %>
2
- <% if @user.errors.any? %>
3
- <div id="errorExplanation">
4
- <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
5
- <ul>
6
- <% @user.errors.full_messages.each do |msg| %>
7
- <li><%= msg %></li>
8
- <% end %>
9
- </ul>
10
- </div>
11
- <% end %>
12
-
13
- <div class="field">
14
- <%= f.label :username %><br />
15
- <%= f.text_field :username %>
16
- </div>
17
- <div class="field">
18
- <%= f.label :email %><br />
19
- <%= f.email_field :email %>
20
- </div>
21
- <div class="actions">
22
- <%= f.submit %>
23
- </div>
24
- <% end %>
@@ -1 +0,0 @@
1
- <%= render 'page/index' %>
@@ -1,32 +0,0 @@
1
- <div id="content_detail" class="ui-corner-all ui-widget-content">
2
- <h1 class="title"><%= t('page.edit_user_profile', login_name: @profile.user.username) -%></h1>
3
- <div id="content_list">
4
- <%= render 'page/required_field' %>
5
- <%= simple_form_for(@profile, url: my_account_path) do |f| -%>
6
- <%= f.error_messages -%>
7
-
8
- <%= render partial: 'edit_credential', locals: {f: f, profile: @profile} -%>
9
-
10
- <div class="actions" style="clear: both">
11
- <%= f.submit %>
12
- </div>
13
- <div class="field">
14
- <%= f.label :keyword_list -%><br />
15
- <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
16
- </div>
17
-
18
- <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
19
- <%- end -%>
20
-
21
- </div>
22
- </div>
23
-
24
- <div id="submenu" class="ui-corner-all ui-widget-content">
25
- <ul>
26
- <li><%= link_to t('page.show'), my_account_path -%></li>
27
- <% if current_user.has_role?('Librarian') %>
28
- <li><%= link_to t('page.listing', model: t('activerecord.models.user')), profiles_path -%></li>
29
- <% end %>
30
- <li><%= link_to t('activerecord.models.registration'), edit_user_registration_path -%></li>
31
- </ul>
32
- </div>