enju_leaf 1.1.0.rc7 → 1.1.0.rc8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (126) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +7 -4
  3. data/app/assets/javascripts/jquery.mobile-1.4.2.js +15056 -0
  4. data/app/assets/javascripts/mobile.js +1 -1
  5. data/app/assets/javascripts/profiles.js +2 -0
  6. data/app/assets/stylesheets/enju.css +1 -1
  7. data/app/assets/stylesheets/jquery.mobile-1.4.2.css +4698 -0
  8. data/app/assets/stylesheets/mobile.css +1 -1
  9. data/app/assets/stylesheets/normalize.css +406 -0
  10. data/app/assets/stylesheets/profiles.css +4 -0
  11. data/app/controllers/user_import_files_controller.rb +93 -0
  12. data/app/controllers/user_import_results_controller.rb +15 -0
  13. data/app/controllers/users_controller.rb +2 -2
  14. data/app/helpers/profiles_helper.rb +2 -0
  15. data/app/models/enju_leaf/ability.rb +12 -2
  16. data/app/models/profile.rb +15 -0
  17. data/app/models/user_import_file.rb +171 -0
  18. data/app/models/user_import_result.rb +9 -0
  19. data/app/views/kaminari/{_first_page.mobile.erb → enju_leaf_mobile/_first_page.html.erb} +0 -0
  20. data/app/views/kaminari/{_gap.mobile.erb → enju_leaf_mobile/_gap.html.erb} +0 -0
  21. data/app/views/kaminari/{_last_page.mobile.erb → enju_leaf_mobile/_last_page.html.erb} +0 -0
  22. data/app/views/kaminari/{_next_page.mobile.erb → enju_leaf_mobile/_next_page.html.erb} +0 -0
  23. data/app/views/kaminari/{_page.mobile.erb → enju_leaf_mobile/_page.html.erb} +0 -0
  24. data/app/views/kaminari/{_paginator.mobile.erb → enju_leaf_mobile/_paginator.html.erb} +0 -0
  25. data/app/views/kaminari/{_prev_page.mobile.erb → enju_leaf_mobile/_prev_page.html.erb} +0 -0
  26. data/app/views/page/_footer.html.erb +3 -3
  27. data/app/views/page/_menu.html.erb +1 -1
  28. data/app/views/page/about.en.html.erb +2 -2
  29. data/app/views/page/about.ja.html.erb +2 -2
  30. data/app/views/page/configuration.html.erb +12 -0
  31. data/app/views/page/import.html.erb +6 -5
  32. data/app/views/profiles/_form.html.erb +53 -0
  33. data/app/views/profiles/edit.html.erb +6 -0
  34. data/app/views/profiles/index.html.erb +43 -0
  35. data/app/views/profiles/new.html.erb +14 -0
  36. data/app/views/profiles/show.html.erb +54 -0
  37. data/app/views/user_groups/_form.html.erb +1 -1
  38. data/app/views/user_import_files/_form.html.erb +61 -0
  39. data/app/views/user_import_files/edit.html.erb +6 -0
  40. data/app/views/user_import_files/index.html.erb +43 -0
  41. data/app/views/user_import_files/new.html.erb +35 -0
  42. data/app/views/user_import_files/show.html.erb +59 -0
  43. data/app/views/user_import_results/_form.html.erb +29 -0
  44. data/app/views/user_import_results/index.html.erb +31 -0
  45. data/app/views/user_import_results/show.html.erb +19 -0
  46. data/app/views/users/new.html.erb +4 -4
  47. data/config/locales/translation_en.yml +17 -6
  48. data/config/locales/translation_ja.yml +17 -1
  49. data/config/routes.rb +8 -0
  50. data/db/migrate/20140110122216_create_user_import_files.rb +19 -0
  51. data/db/migrate/20140110131010_create_user_import_results.rb +11 -0
  52. data/db/migrate/20140122054321_create_profiles.rb +21 -0
  53. data/lib/enju_leaf/engine.rb +1 -0
  54. data/lib/enju_leaf/user.rb +6 -3
  55. data/lib/enju_leaf/version.rb +1 -1
  56. data/lib/generators/enju_leaf/setup/setup_generator.rb +3 -1
  57. data/lib/generators/enju_leaf/setup/templates/Procfile +3 -0
  58. data/lib/generators/enju_leaf/setup/templates/config/application.yml +1 -1
  59. data/lib/generators/enju_leaf/setup/templates/config/schedule.rb +1 -2
  60. data/spec/controllers/user_import_files_controller_spec.rb +294 -0
  61. data/spec/controllers/user_import_results_controller_spec.rb +137 -0
  62. data/spec/dummy/db/development.sqlite3 +0 -0
  63. data/spec/dummy/db/schema.rb +25 -1
  64. data/spec/dummy/db/test.sqlite3 +0 -0
  65. data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv +4 -0
  66. data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv +5 -0
  67. data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_update_file.tsv +4 -0
  68. data/spec/dummy/private/system/user_import_files/user_imports/980/190/964/original/user_delete_file.tsv +4 -0
  69. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  70. data/spec/dummy/solr/default/data/index/segments_1la +0 -0
  71. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000063 → tlog.0000000000000002051} +0 -0
  72. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002052 +0 -0
  73. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000065 → tlog.0000000000000002053} +0 -0
  74. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002054 +0 -0
  75. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000067 → tlog.0000000000000002055} +0 -0
  76. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002056 +0 -0
  77. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000069 → tlog.0000000000000002057} +0 -0
  78. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002058 +0 -0
  79. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002059 +0 -0
  80. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000002060 +0 -0
  81. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  82. data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
  83. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  84. data/spec/dummy/tmp/cache/assets/test/sprockets/154f7b83f2da0e86effbe25f32135177 +0 -0
  85. data/spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d +0 -0
  86. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  87. data/spec/dummy/tmp/cache/assets/test/sprockets/3054c50144654f9c7e57bb0639a276e9 +0 -0
  88. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  89. data/spec/dummy/tmp/cache/assets/test/sprockets/3bd7a263237ba366f64d938fe5303757 +0 -0
  90. data/spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9 +0 -0
  91. data/spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2 +0 -0
  92. data/spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7 +0 -0
  93. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  94. data/spec/dummy/tmp/cache/assets/test/sprockets/d38d8658b30de1d068603968227680d4 +0 -0
  95. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  96. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
  97. data/spec/fixtures/user_import_files.yml +27 -0
  98. data/spec/fixtures/user_import_results.yml +13 -0
  99. data/spec/models/user_import_file_spec.rb +64 -0
  100. data/spec/models/user_import_result_spec.rb +7 -0
  101. data/vendor/assets/javascripts/jquery.colorbox.js +220 -213
  102. data/vendor/assets/stylesheets/colorbox.css +1 -1
  103. metadata +224 -150
  104. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +0 -620
  105. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/redirects_to_the_created_import_request.yml +0 -620
  106. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +0 -620
  107. data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/redirects_to_the_created_import_request.yml +0 -620
  108. data/spec/cassette_library/Manifestation/should_import_isbn.yml +0 -537
  109. data/spec/cassette_library/Question/test_should_get_crd_search.yml +0 -437
  110. data/spec/dummy/solr/default/data/index/_z.fdt +0 -0
  111. data/spec/dummy/solr/default/data/index/_z.fdx +0 -0
  112. data/spec/dummy/solr/default/data/index/_z.fnm +0 -0
  113. data/spec/dummy/solr/default/data/index/_z.nvd +0 -0
  114. data/spec/dummy/solr/default/data/index/_z.nvm +0 -0
  115. data/spec/dummy/solr/default/data/index/_z.si +0 -0
  116. data/spec/dummy/solr/default/data/index/_z_Lucene41_0.doc +0 -0
  117. data/spec/dummy/solr/default/data/index/_z_Lucene41_0.pos +0 -0
  118. data/spec/dummy/solr/default/data/index/_z_Lucene41_0.tim +0 -0
  119. data/spec/dummy/solr/default/data/index/_z_Lucene41_0.tip +0 -0
  120. data/spec/dummy/solr/default/data/index/segments_21 +0 -0
  121. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000062 +0 -0
  122. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000064 +0 -0
  123. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000066 +0 -0
  124. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000068 +0 -0
  125. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000070 +0 -0
  126. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000071 +0 -0
@@ -0,0 +1,6 @@
1
+ <h1>Editing profile</h1>
2
+
3
+ <%= render 'form' %>
4
+
5
+ <%= link_to 'Show', @profile %> |
6
+ <%= link_to 'Back', profiles_path %>
@@ -0,0 +1,43 @@
1
+ <h1>Listing profiles</h1>
2
+
3
+ <table>
4
+ <thead>
5
+ <tr>
6
+ <th>User</th>
7
+ <th>User group</th>
8
+ <th>Library</th>
9
+ <th>Locale</th>
10
+ <th>User number</th>
11
+ <th>Full name</th>
12
+ <th>Note</th>
13
+ <th>Keyword list</th>
14
+ <th>Required role</th>
15
+ <th>State</th>
16
+ <th colspan="3"></th>
17
+ </tr>
18
+ </thead>
19
+
20
+ <tbody>
21
+ <% @profiles.each do |profile| %>
22
+ <tr>
23
+ <td><%= profile.user_id %></td>
24
+ <td><%= profile.user_group_id %></td>
25
+ <td><%= profile.library_id %></td>
26
+ <td><%= profile.locale %></td>
27
+ <td><%= profile.user_number %></td>
28
+ <td><%= profile.full_name %></td>
29
+ <td><%= profile.note %></td>
30
+ <td><%= profile.keyword_list %></td>
31
+ <td><%= profile.required_role_id %></td>
32
+ <td><%= profile.state %></td>
33
+ <td><%= link_to 'Show', profile %></td>
34
+ <td><%= link_to 'Edit', edit_profile_path(profile) %></td>
35
+ <td><%= link_to 'Destroy', profile, method: :delete, data: { confirm: 'Are you sure?' } %></td>
36
+ </tr>
37
+ <% end %>
38
+ </tbody>
39
+ </table>
40
+
41
+ <br>
42
+
43
+ <%= link_to 'New Profile', new_profile_path %>
@@ -0,0 +1,14 @@
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
+ <h1 class="title"><%= t('page.new', :model => t('activerecord.models.profile')) -%></h1>
3
+ <div id="content_list">
4
+
5
+ <%= render 'form' %>
6
+
7
+ </div>
8
+ </div>
9
+
10
+ <div id="submenu" class="ui-corner-all ui-widget-content">
11
+ <ul>
12
+ <li><%= link_to 'Back', profiles_path %></li>
13
+ </ul>
14
+ </div>
@@ -0,0 +1,54 @@
1
+ <p id="notice"><%= notice %></p>
2
+
3
+ <p>
4
+ <strong>User:</strong>
5
+ <%= @profile.user_id %>
6
+ </p>
7
+
8
+ <p>
9
+ <strong>User group:</strong>
10
+ <%= @profile.user_group_id %>
11
+ </p>
12
+
13
+ <p>
14
+ <strong>Library:</strong>
15
+ <%= @profile.library_id %>
16
+ </p>
17
+
18
+ <p>
19
+ <strong>Locale:</strong>
20
+ <%= @profile.locale %>
21
+ </p>
22
+
23
+ <p>
24
+ <strong>User number:</strong>
25
+ <%= @profile.user_number %>
26
+ </p>
27
+
28
+ <p>
29
+ <strong>Full name:</strong>
30
+ <%= @profile.full_name %>
31
+ </p>
32
+
33
+ <p>
34
+ <strong>Note:</strong>
35
+ <%= @profile.note %>
36
+ </p>
37
+
38
+ <p>
39
+ <strong>Keyword list:</strong>
40
+ <%= @profile.keyword_list %>
41
+ </p>
42
+
43
+ <p>
44
+ <strong>Required role:</strong>
45
+ <%= @profile.required_role_id %>
46
+ </p>
47
+
48
+ <p>
49
+ <strong>State:</strong>
50
+ <%= @profile.state %>
51
+ </p>
52
+
53
+ <%= link_to 'Edit', edit_profile_path(@profile) %> |
54
+ <%= link_to 'Back', profiles_path %>
@@ -26,7 +26,7 @@
26
26
  <%= f.text_field :number_of_time_to_notify_overdue, :class => 'resource_integer' %>
27
27
  </div>
28
28
 
29
- <% if defined?(EnjuCirculation) %>
29
+ <% if defined?(EnjuCirculation) and !@user_group.new_record? %>
30
30
  <%= render 'user_groups/checkout_form', :f => f %>
31
31
  <% end %>
32
32
 
@@ -0,0 +1,61 @@
1
+ <%= form_for(@user_import_file) do |f| %>
2
+ <% if @user_import_file.errors.any? %>
3
+ <div id="error_explanation">
4
+ <h2><%= pluralize(@user_import_file.errors.count, "error") %> prohibited this user_import_file from being saved:</h2>
5
+
6
+ <ul>
7
+ <% @user_import_file.errors.full_messages.each do |msg| %>
8
+ <li><%= msg %></li>
9
+ <% end %>
10
+ </ul>
11
+ </div>
12
+ <% end %>
13
+
14
+ <div class="field">
15
+ <%= f.label :user_id %><br>
16
+ <%= f.number_field :user_id %>
17
+ </div>
18
+ <div class="field">
19
+ <%= f.label :note %><br>
20
+ <%= f.text_area :note %>
21
+ </div>
22
+ <div class="field">
23
+ <%= f.label :executed_at %><br>
24
+ <%= f.datetime_select :executed_at %>
25
+ </div>
26
+ <div class="field">
27
+ <%= f.label :state %><br>
28
+ <%= f.text_field :state %>
29
+ </div>
30
+ <div class="field">
31
+ <%= f.label :user_import_file_name %><br>
32
+ <%= f.text_field :user_import_file_name %>
33
+ </div>
34
+ <div class="field">
35
+ <%= f.label :user_import_content_type %><br>
36
+ <%= f.text_field :user_import_content_type %>
37
+ </div>
38
+ <div class="field">
39
+ <%= f.label :user_import_file_size %><br>
40
+ <%= f.text_field :user_import_file_size %>
41
+ </div>
42
+ <div class="field">
43
+ <%= f.label :user_import_updated_at %><br>
44
+ <%= f.datetime_select :user_import_updated_at %>
45
+ </div>
46
+ <div class="field">
47
+ <%= f.label :user_import_fingerprint %><br>
48
+ <%= f.text_field :user_import_fingerprint %>
49
+ </div>
50
+ <div class="field">
51
+ <%= f.label :edit_mode %><br>
52
+ <%= f.text_field :edit_mode %>
53
+ </div>
54
+ <div class="field">
55
+ <%= f.label :error_message %><br>
56
+ <%= f.text_area :error_message %>
57
+ </div>
58
+ <div class="actions">
59
+ <%= f.submit %>
60
+ </div>
61
+ <% end %>
@@ -0,0 +1,6 @@
1
+ <h1>Editing user_import_file</h1>
2
+
3
+ <%= render 'form' %>
4
+
5
+ <%= link_to 'Show', @user_import_file %> |
6
+ <%= link_to 'Back', user_import_files_path %>
@@ -0,0 +1,43 @@
1
+ <div id="content_detail" class="ui-corner-all">
2
+ <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_import_file')) -%></h1>
3
+ <div id="content_list">
4
+
5
+ <table class="table table-striped index">
6
+ <thead>
7
+ <tr>
8
+ <th><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%></th>
9
+ <th><%= t('activerecord.attributes.user_import_file.executed_at') -%></th>
10
+ <th><%= t('activerecord.models.user') -%></th>
11
+ <th><%= t('activerecord.attributes.user_import_file.edit_mode') -%></th>
12
+ <th><%= t('activerecord.attributes.user_import_file.state') -%></th>
13
+ <th></th>
14
+ <th></th>
15
+ <th></th>
16
+ </tr>
17
+ </thead>
18
+
19
+ <tbody>
20
+ <% @user_import_files.each do |user_import_file| %>
21
+ <tr>
22
+ <td><%= user_import_file.user_import_file_name %></td>
23
+ <td><%= user_import_file.executed_at %></td>
24
+ <td><%= link_to user_import_file.user.username, user_import_file.user if user_import_file.user %></td>
25
+ <td><%= user_import_file.edit_mode %></td>
26
+ <td><%= user_import_file.state %></td>
27
+ <td><%= link_to 'Show', user_import_file %></td>
28
+ <td><%= link_to 'Edit', edit_user_import_file_path(user_import_file) %></td>
29
+ <td><%= link_to 'Destroy', user_import_file, method: :delete, data: { confirm: 'Are you sure?' } %></td>
30
+ </tr>
31
+ <% end %>
32
+ </tbody>
33
+ </table>
34
+
35
+ <%= paginate(@user_import_files) -%>
36
+ </div>
37
+ </div>
38
+
39
+ <div id="submenu" class="ui-corner-all">
40
+ <ul>
41
+ <li><%= link_to t('page.new', :model => t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
42
+ </ul>
43
+ </div>
@@ -0,0 +1,35 @@
1
+ <div id="content_detail" class="ui-corner-all">
2
+ <h1 class="title"><%= t('page.new', :model => t('activerecord.models.resource_import_file')) -%></h1>
3
+ <div id="content_list">
4
+
5
+ <%= form_for(@user_import_file, :html => { :multipart => true }) do |f| %>
6
+ <%= f.error_messages -%>
7
+
8
+ <div class="field">
9
+ <%= f.label t('page.file') %><br />
10
+ <%= f.file_field :user_import %>
11
+ </div>
12
+
13
+ <div class="field">
14
+ <%= f.label :edit_mode -%><br />
15
+ <%= f.radio_button :edit_mode, 'create', :checked => 'checked' %>
16
+ <%= f.label :edit_mode, t('page.create'), :value => 'create' %>
17
+ <%= f.radio_button :edit_mode, 'update' %>
18
+ <%= f.label :edit_mode, t('page.update'), :value => 'update' %>
19
+ <%= f.radio_button :edit_mode, 'destroy' %>
20
+ <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
21
+ </div>
22
+
23
+ <div class="actions">
24
+ <%= f.submit %>
25
+ </div>
26
+ <% end %>
27
+
28
+ </div>
29
+ </div>
30
+
31
+ <div id="submenu" class="ui-corner-all">
32
+ <ul>
33
+ <li><%= back_to_index(flash[:page_info]) %></li>
34
+ </ul>
35
+ </div>
@@ -0,0 +1,59 @@
1
+ <p id="notice"><%= notice %></p>
2
+
3
+ <p>
4
+ <strong>User:</strong>
5
+ <%= @user_import_file.user_id %>
6
+ </p>
7
+
8
+ <p>
9
+ <strong>Note:</strong>
10
+ <%= @user_import_file.note %>
11
+ </p>
12
+
13
+ <p>
14
+ <strong>Executed at:</strong>
15
+ <%= @user_import_file.executed_at %>
16
+ </p>
17
+
18
+ <p>
19
+ <strong>State:</strong>
20
+ <%= @user_import_file.state %>
21
+ </p>
22
+
23
+ <p>
24
+ <strong>User import file name:</strong>
25
+ <%= @user_import_file.user_import_file_name %>
26
+ </p>
27
+
28
+ <p>
29
+ <strong>User import content type:</strong>
30
+ <%= @user_import_file.user_import_content_type %>
31
+ </p>
32
+
33
+ <p>
34
+ <strong>User import file size:</strong>
35
+ <%= @user_import_file.user_import_file_size %>
36
+ </p>
37
+
38
+ <p>
39
+ <strong>User import updated at:</strong>
40
+ <%= @user_import_file.user_import_updated_at %>
41
+ </p>
42
+
43
+ <p>
44
+ <strong>User import fingerprint:</strong>
45
+ <%= @user_import_file.user_import_fingerprint %>
46
+ </p>
47
+
48
+ <p>
49
+ <strong>Edit mode:</strong>
50
+ <%= @user_import_file.edit_mode %>
51
+ </p>
52
+
53
+ <p>
54
+ <strong>Error message:</strong>
55
+ <%= @user_import_file.error_message %>
56
+ </p>
57
+
58
+ <%= link_to 'Edit', edit_user_import_file_path(@user_import_file) %> |
59
+ <%= link_to 'Back', user_import_files_path %>
@@ -0,0 +1,29 @@
1
+ <%= form_for(@user_import_result) do |f| %>
2
+ <% if @user_import_result.errors.any? %>
3
+ <div id="error_explanation">
4
+ <h2><%= pluralize(@user_import_result.errors.count, "error") %> prohibited this user_import_result from being saved:</h2>
5
+
6
+ <ul>
7
+ <% @user_import_result.errors.full_messages.each do |msg| %>
8
+ <li><%= msg %></li>
9
+ <% end %>
10
+ </ul>
11
+ </div>
12
+ <% end %>
13
+
14
+ <div class="field">
15
+ <%= f.label :user_import_file_id %><br>
16
+ <%= f.number_field :user_import_file_id %>
17
+ </div>
18
+ <div class="field">
19
+ <%= f.label :user_id %><br>
20
+ <%= f.number_field :user_id %>
21
+ </div>
22
+ <div class="field">
23
+ <%= f.label :body %><br>
24
+ <%= f.text_area :body %>
25
+ </div>
26
+ <div class="actions">
27
+ <%= f.submit %>
28
+ </div>
29
+ <% end %>
@@ -0,0 +1,31 @@
1
+ <h1>Listing user_import_results</h1>
2
+
3
+ <table>
4
+ <thead>
5
+ <tr>
6
+ <th>User import file</th>
7
+ <th>User</th>
8
+ <th>Body</th>
9
+ <th></th>
10
+ <th></th>
11
+ <th></th>
12
+ </tr>
13
+ </thead>
14
+
15
+ <tbody>
16
+ <% @user_import_results.each do |user_import_result| %>
17
+ <tr>
18
+ <td><%= user_import_result.user_import_file_id %></td>
19
+ <td><%= user_import_result.user_id %></td>
20
+ <td><%= user_import_result.body %></td>
21
+ <td><%= link_to 'Show', user_import_result %></td>
22
+ <td><%= link_to 'Edit', edit_user_import_result_path(user_import_result) %></td>
23
+ <td><%= link_to 'Destroy', user_import_result, method: :delete, data: { confirm: 'Are you sure?' } %></td>
24
+ </tr>
25
+ <% end %>
26
+ </tbody>
27
+ </table>
28
+
29
+ <br>
30
+
31
+ <%= link_to 'New User import result', new_user_import_result_path %>
@@ -0,0 +1,19 @@
1
+ <p id="notice"><%= notice %></p>
2
+
3
+ <p>
4
+ <strong>User import file:</strong>
5
+ <%= @user_import_result.user_import_file_id %>
6
+ </p>
7
+
8
+ <p>
9
+ <strong>User:</strong>
10
+ <%= @user_import_result.user_id %>
11
+ </p>
12
+
13
+ <p>
14
+ <strong>Body:</strong>
15
+ <%= @user_import_result.body %>
16
+ </p>
17
+
18
+ <%= link_to 'Edit', edit_user_import_result_path(@user_import_result) %> |
19
+ <%= link_to 'Back', user_import_results_path %>
@@ -14,20 +14,20 @@
14
14
  <%- end -%>
15
15
 
16
16
  <div class="field">
17
- <%= f.label :username -%></label>
17
+ <%= f.label :username -%>
18
18
  <%= f.text_field :username, :class => 'resource_user' -%>
19
19
  </div>
20
20
  <div class="field">
21
- <%= f.label :email -%></label>
21
+ <%= f.label :email -%>
22
22
  <%= f.email_field :email, :class => 'resource_email' -%>
23
23
  </div>
24
24
  <div class="field">
25
- <%= f.label :email_confirmation -%></label>
25
+ <%= f.label :email_confirmation -%>
26
26
  <%= f.email_field :email_confirmation, :class => 'resource_email' -%>
27
27
  </div>
28
28
 
29
29
  <div class="field">
30
- <label for="user_group"><%= t('activerecord.models.user_group') -%></label>
30
+ <%= f.label :user_group_id -%>
31
31
  <%= f.select(:user_group_id, @user_groups.collect{|u| [u.name, u.id]}) -%>
32
32
  </div>
33
33