enju_leaf 1.1.0.rc13 → 1.1.0.rc14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/enju.css +5 -0
  3. data/app/controllers/user_import_results_controller.rb +30 -6
  4. data/app/models/enju_leaf/ability.rb +22 -10
  5. data/app/models/user_import_file.rb +1 -1
  6. data/app/views/profiles/index.html.erb +10 -3
  7. data/config/locales/translation_en.yml +3 -72
  8. data/config/locales/translation_ja.yml +3 -72
  9. data/lib/enju_leaf/master_model.rb +11 -0
  10. data/lib/enju_leaf/user.rb +1 -1
  11. data/lib/enju_leaf/version.rb +1 -1
  12. data/lib/generators/enju_leaf/setup/templates/db/seeds.rb +20 -9
  13. data/lib/tasks/enju_leaf_tasks.rake +2 -1
  14. data/spec/dummy/config/application.rb +1 -0
  15. data/spec/dummy/db/test.sqlite3 +0 -0
  16. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-59118-14fm7df.txt +8 -0
  17. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-59989-vmovk5.txt +8 -0
  18. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-75062-kpzjyb.txt +8 -0
  19. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-75773-1lhgyub.txt +8 -0
  20. data/spec/dummy/public/system/user_export_files/user_exports/000/000/003/original/user_export_file_20140818-75927-j8wteq.txt +8 -0
  21. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-59118-1lhrtka.txt +8 -0
  22. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-59989-1prz707.txt +8 -0
  23. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-75062-10bxh78.txt +8 -0
  24. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-75773-ekgeho.txt +8 -0
  25. data/spec/dummy/public/system/user_export_files/user_exports/000/000/004/original/user_export_file_20140818-75927-uay97k.txt +8 -0
  26. data/spec/dummy/solr/default/data/index/_5b.fdt +0 -0
  27. data/spec/dummy/solr/default/data/index/{_4h.fdx → _5b.fdx} +0 -0
  28. data/spec/dummy/solr/default/data/index/{_4h.fnm → _5b.fnm} +0 -0
  29. data/spec/dummy/solr/default/data/index/{_4h.nvd → _5b.nvd} +0 -0
  30. data/spec/dummy/solr/default/data/index/{_4h.nvm → _5b.nvm} +0 -0
  31. data/spec/dummy/solr/default/data/index/{_4h.si → _5b.si} +0 -0
  32. data/spec/dummy/solr/default/data/index/{_4h_Lucene41_0.doc → _5b_Lucene41_0.doc} +0 -0
  33. data/spec/dummy/solr/default/data/index/{_4h_Lucene41_0.pos → _5b_Lucene41_0.pos} +0 -0
  34. data/spec/dummy/solr/default/data/index/{_4h_Lucene41_0.tim → _5b_Lucene41_0.tim} +0 -0
  35. data/spec/dummy/solr/default/data/index/{_4h_Lucene41_0.tip → _5b_Lucene41_0.tip} +0 -0
  36. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  37. data/spec/dummy/solr/default/data/index/segments_av +0 -0
  38. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000380 +0 -0
  39. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000321 → tlog.0000000000000000381} +0 -0
  40. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000382 +0 -0
  41. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000323 → tlog.0000000000000000383} +0 -0
  42. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000384 +0 -0
  43. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000325 → tlog.0000000000000000385} +0 -0
  44. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000386 +0 -0
  45. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000327 → tlog.0000000000000000387} +0 -0
  46. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000388 +0 -0
  47. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000389 +0 -0
  48. data/spec/dummy/tmp/cache/stdout +276 -0
  49. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  50. data/spec/models/user_group_spec.rb +13 -1
  51. metadata +74 -55
  52. data/spec/dummy/solr/default/data/index/_4h.fdt +0 -0
  53. data/spec/dummy/solr/default/data/index/segments_97 +0 -0
  54. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000320 +0 -0
  55. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000322 +0 -0
  56. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000324 +0 -0
  57. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000326 +0 -0
  58. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000328 +0 -0
  59. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000329 +0 -0
  60. data/vendor/assets/stylesheets/acts_as_taggable_stylesheet.css +0 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 30cec87ac36bc5f86229522a16fa000de67d4045
4
- data.tar.gz: 1e767244cb0a31287ae1bf0f9a7e100c6495e129
3
+ metadata.gz: 95ae9f6dfbaf5012408bc8d3a69282851cde058e
4
+ data.tar.gz: c74028321f37ac263e7a9c05ab8be4c19f0a66af
5
5
  SHA512:
6
- metadata.gz: 7280e3e949c72894314feb4fbd57679cf6c4b6e49641df908c949f060965e41736bff362e0f3c924010bd4b8a8499a424421a8b37809c07560cfbd64eede0e76
7
- data.tar.gz: 5d12f151f53a63dc8eb387ebe89b8d403b121e83a247da1dc27f67378dd63a1e9d115658612c91f73201d80bd9dbc8b9ddc3eaf081ab0689b408196c35736c09
6
+ metadata.gz: fd22fba7f3d5e4df989f5643a07a3e7e4be3a46aadbd156220e8517972139ae411de29edb655849d0f76a8f0b2b4f7cdaf4d3aaf418157733816d7ef2af316c4
7
+ data.tar.gz: cfb1a898f9ab8e590dcefe7195b00c09d60d6fae88e79575f9abaa76cb2730f97b609262c7b54be90561e94ad3128e4cba89e3241ba42ae13f08e0019fb9c059
@@ -366,6 +366,11 @@ input.resource_isbn_issn, input.resource_identifier, input.resource_user_number,
366
366
  ime-mode: disabled;
367
367
  }
368
368
 
369
+ input.resource_identifier_body{
370
+ width: 20em;
371
+ ime-mode: disabled;
372
+ }
373
+
369
374
  input.resource_integer{
370
375
  width: 5em;
371
376
  ime-mode: disabled;
@@ -1,15 +1,39 @@
1
- class UserImportResultsController < InheritedResources::Base
2
- respond_to :html, :json, :txt
1
+ class UserImportResultsController < ApplicationController
3
2
  load_and_authorize_resource
4
- has_scope :file_id
5
- actions :index, :show, :destroy
6
-
3
+ # GET /user_import_results
4
+ # GET /user_import_results.json
7
5
  def index
8
- @user_import_file = UserImportFile.where(:id => params[:user_import_file_id]).first
6
+ @user_import_file = UserImportFile.where(id: params[:user_import_file_id]).first
9
7
  if @user_import_file
10
8
  @user_import_results = @user_import_file.user_import_results.page(params[:page])
11
9
  else
12
10
  @user_import_results = UserImportResult.page(params[:page])
13
11
  end
12
+
13
+ respond_to do |format|
14
+ format.html # index.html.erb
15
+ format.json { render json: @user_import_results }
16
+ format.txt
17
+ end
18
+ end
19
+
20
+ # GET /user_import_results/1
21
+ # GET /user_import_results/1.json
22
+ def show
23
+ respond_to do |format|
24
+ format.html # show.html.erb
25
+ format.json { render json: @user_import_result }
26
+ end
27
+ end
28
+
29
+ # DELETE /user_import_results/1
30
+ # DELETE /user_import_results/1.json
31
+ def destroy
32
+ @user_import_result.destroy
33
+
34
+ respond_to do |format|
35
+ format.html { redirect_to user_import_results_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.user_import_result')) }
36
+ format.json { head :no_content }
37
+ end
14
38
  end
15
39
  end
@@ -9,12 +9,18 @@ module EnjuLeaf
9
9
  can :index, Profile
10
10
  can [:read, :create, :update], [User, Profile]
11
11
  can :destroy, Profile do |profile|
12
- if profile != user.profile and profile.user.id != 1
13
- if defined?(EnjuCirculation)
14
- true if profile.user.checkouts.not_returned.empty?
15
- else
16
- true
12
+ if profile.user
13
+ if profile != user.profile and profile.user.id != 1
14
+ if defined?(EnjuCirculation)
15
+ if profile.user.checkouts.not_returned.empty?
16
+ true if profile.user.deletable_by?(user)
17
+ end
18
+ else
19
+ true if profile.user.deletable_by?(user)
20
+ end
17
21
  end
22
+ else
23
+ true
18
24
  end
19
25
  end
20
26
  can [:read, :create, :update], UserGroup
@@ -38,12 +44,18 @@ module EnjuLeaf
38
44
  when 'Librarian'
39
45
  can [:read, :create, :update], Profile
40
46
  can :destroy, Profile do |profile|
41
- if profile.user.role.name == 'User' and profile != user.profile
42
- if defined?(EnjuCirculation)
43
- true if profile.user.checkouts.not_returned.empty?
44
- else
45
- true
47
+ if profile.user
48
+ if profile != user.profile and profile.user.id != 1
49
+ if defined?(EnjuCirculation)
50
+ if profile.user.checkouts.not_returned.empty?
51
+ true if profile.user.deletable_by?(user)
52
+ end
53
+ else
54
+ true if profile.user.deletable_by?(user)
55
+ end
46
56
  end
57
+ else
58
+ true
47
59
  end
48
60
  end
49
61
  can :manage, [
@@ -5,7 +5,7 @@ class UserImportFile < ActiveRecord::Base
5
5
  include ImportFile
6
6
  default_scope {order('user_import_files.id DESC')}
7
7
  scope :not_imported, -> {in_state(:pending)}
8
- scope :stucked, -> {in_state(:pending).where('created_at < ? AND state = ?', 1.hour.ago)}
8
+ scope :stucked, -> {in_state(:pending).where('user_import_files.created_at < ?', 1.hour.ago)}
9
9
 
10
10
  if Setting.uploaded_file.storage == :s3
11
11
  has_attached_file :user_import, :storage => :s3,
@@ -24,17 +24,24 @@
24
24
  <%= link_to image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), url_for(params.merge(sort_by: 'created_at', order: 'asc', only_path: true)) -%>
25
25
  <%= link_to image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), url_for(params.merge(sort_by: 'created_at', order: 'desc', only_path: true)) -%>
26
26
  </th>
27
- <th></th>
27
+ <th style="width: 80px"></th>
28
28
  </tr>
29
29
 
30
30
  <%- @profiles.each_with_index do |profile, i| -%>
31
31
  <tr class="line<%= cycle("0", "1") -%>">
32
32
  <td>
33
- <%= link_to profile.user.username, profile -%>
33
+ <%= profile.user.try(:username) -%>
34
+ </td>
35
+ <td>
36
+ <% if profile.user_number %>
37
+ <%= link_to profile.user_number, profile -%>
38
+ <% else %>
39
+ <%= link_to t('profile.no_number'), profile -%>
40
+ <% end %>
34
41
  </td>
35
- <td><%= profile.user_number -%></td>
36
42
  <td><%= l(profile.created_at) -%></td>
37
43
  <td>
44
+ <%= link_to t('page.show'), profile -%>
38
45
  <%= link_to t('page.edit'), edit_profile_path(profile) -%>
39
46
  </td>
40
47
  </tr>
@@ -282,6 +282,7 @@ en:
282
282
  electronic_resource_management: "Electronic resource management"
283
283
  system: System
284
284
  manual: Manual
285
+ cannot_parse_yaml_header: "has an invalid YAML header. You must add a space after the header's colon."
285
286
  title:
286
287
  index: "index"
287
288
  show: "show"
@@ -307,78 +308,6 @@ en:
307
308
  add: "Add an expression"
308
309
  specify_work: "Specify the work."
309
310
  specify_manifestation: "Specify the manifestation."
310
- manifestation:
311
- date_of_acquisition: "Date of acquisition"
312
- physical_description: "Physical description"
313
- edit: "Edit this manifestation"
314
- add_next_issue: "Add a next issue"
315
- edit_creator: "Edit creators"
316
- edit_contributor: "Edit contributors"
317
- edit_publisher: "Edit publishers"
318
- edit_expression: "Edit expressions"
319
- edit_item: "Edit items"
320
- expressions_manifestation: "Manifestations for %{expression_title}"
321
- library_group_manifestation: "Manifestations in %{library_group_name}"
322
- reserve_this: "Reserve this manifestation"
323
- cancel_reservation: "Cancel this reservation"
324
- user_who_bookmark_this_resource: "Users who bookmark this resource"
325
- query_search_result: "Search results for %{query} in %{library_group_name}"
326
- serial: "Serial"
327
- number: "Number"
328
- invalid_isbn: "Invalid ISBN."
329
- already_imported: "This manifestation is already imporeted."
330
- record_not_found: "Record not found."
331
- add: "Add a manifestation"
332
- specify_expression: "Specify the expression."
333
- pickup: "Pick up"
334
- showing_all_record: "Showing all records."
335
- showing_reservable_record: "Showing reservable records."
336
- reservable: "Reservable"
337
- all_result: "All results"
338
- reservable_list: "Reservable list"
339
- post_to_twitter: "post to Twitter"
340
- web: "Web"
341
- send_email: "Email this information"
342
- attachment_file: "Attachment file"
343
- add_derivation: "Add a derivation"
344
- item:
345
- current_checkout: "Current checkout"
346
- donor: "Donors"
347
- library_group_item: "Items in %{library_group_name}"
348
- add: "Add an item"
349
- specify_manifestation: "Specify the manifestation."
350
- this_item_is_reserved: "This item is reserved!"
351
- create_shelf_first: "You should create a shelf first."
352
- this_item_include_supplement: "This item includes supplements."
353
- all_item: "All items"
354
- add_new_copy: "Add a new copy"
355
- no_manifestation: "No manifestation"
356
- no_number: "No number"
357
- add_lending_policy: "Add a new lending policy"
358
- edit_exemplification: "Edit exemplification"
359
- accepted_at: "Accepted at"
360
- agent:
361
- library_group_agent: "Agents of %{library_group_name}"
362
- work_agent: "Creaters of %{work_title}"
363
- expression_agent: "Realizers of %{expression_title}"
364
- manifestation_agent: "Producers of %{manifestation_title}"
365
- activate_as_user: "Activate as an user"
366
- deactivate: "Deactivate this user"
367
- add: "Add a agent"
368
- publication: "Publications"
369
- recent_publication: "Recent publications"
370
- all_publication: "All publications"
371
- other_address: "The other address"
372
- add_derivation: "Add derivatation"
373
- creator: "Creator"
374
- contributor: "Contributor"
375
- publisher: "Publisher"
376
- owner: "Owner"
377
- library:
378
- map: "Map"
379
- staff: "Staff"
380
- number_of_item: "Number of items"
381
- address: "Address"
382
311
  import:
383
312
  from_file: "from file"
384
313
  from_isbn: "from ISBN"
@@ -465,3 +394,5 @@ en:
465
394
  user_import_file:
466
395
  default_user_group: If "user_group" column is not set in the TSV file, this user group is set to the new user.
467
396
  default_library: If "library" column is not set in the TSV file, this library is set to the new user.
397
+ profile:
398
+ no_number: No number
@@ -266,6 +266,7 @@ ja:
266
266
  electronic_resource_management: 電子リソース管理
267
267
  system: システム
268
268
  manual: マニュアル
269
+ cannot_parse_yaml_header: "のYAMLヘッダを読み込めません。ヘッダのコロンの後には、半角スペースを含める必要があります。"
269
270
  title:
270
271
  index: "一覧"
271
272
  show: "表示"
@@ -290,78 +291,6 @@ ja:
290
291
  add: "協力した資料を追加する"
291
292
  specify_work: "書いた資料を指定してください。"
292
293
  specify_manifestation: "資料を指定してください。"
293
- manifestation:
294
- date_of_acquisition: "受入日"
295
- physical_description: "ページ数と大きさ"
296
- add_next_issue: "次の号を追加"
297
- edit_creator: "著者を編集"
298
- edit_contributor: "編者を編集"
299
- edit_publisher: "出版者を編集"
300
- edit_expression: "協力した資料を編集"
301
- edit_item: "所蔵を編集"
302
- agent_manifestation: "%{agent_name} の資料"
303
- expressions_manifestation: "%{expression_title} の出版した資料"
304
- library_group_manifestation: "%{library_group_name} にある資料"
305
- reserve_this: "この資料を予約する"
306
- cancel_reservation: "この資料の予約を解除する"
307
- user_who_bookmark_this_resource: "この資料をブックマークしている利用者"
308
- query_search_result: "検索語 %{query} による %{library_group_name} の資料の検索結果"
309
- serial: "定期刊行物"
310
- number: "巻号"
311
- invalid_isbn: "無効なISBNです。"
312
- already_imported: "すでにインポートされています。"
313
- record_not_found: "資料が見つかりませんでした。"
314
- add: "資料を追加する"
315
- specify_expression: "協力した資料を指定してください。"
316
- pickup: "ピックアップ"
317
- showing_all_record: "すべての資料を表示しています。"
318
- showing_reservable_record: "予約可能な資料のみを表示しています。"
319
- reservable: "予約可能"
320
- all_result: "すべての検索結果"
321
- reservable_list: "予約可能な資料の一覧"
322
- post_to_twitter: "Twitterに送信する"
323
- web: "Web"
324
- send_email: "書誌情報を電子メールで送信する"
325
- attachment_file: "添付ファイル"
326
- add_derivation: "派生資料を追加"
327
- item:
328
- current_checkout: "現在の貸出"
329
- donor: "寄贈者"
330
- library_group_item: "%{library_group_name}にある所蔵情報"
331
- add: "所蔵情報を追加する"
332
- specify_manifestation: "資料を指定してください。"
333
- this_item_is_reserved: "この資料は予約されています!"
334
- create_shelf_first: "最初に書棚を作成してください。"
335
- this_item_include_supplement: "この資料は付録を含んでいます。"
336
- all_item: "全ての所蔵情報"
337
- add_new_copy: "複本を追加"
338
- no_manifestation: "資料なし"
339
- no_number: "番号なし"
340
- add_lending_policy: "貸出規則の追加"
341
- edit_exemplification: "書誌の付け替え"
342
- accepted_at: "検収時刻"
343
- agent:
344
- library_group_agent: "%{library_group_name} の人物・団体"
345
- work_agent: "%{work_title} の著作者"
346
- expression_agent: "%{expression_title} の編者"
347
- manifestation_agent: "%{manifestation_title} の出版者"
348
- activate_as_user: "利用者として登録する"
349
- deactivate: "利用者登録を解除する"
350
- add: "人物・団体を追加する"
351
- publication: "出版物"
352
- recent_publication: "最近の出版物"
353
- all_publication: "全ての出版物"
354
- other_address: "他の住所"
355
- add_derivation: "派生人物・団体を追加"
356
- creator: "著者"
357
- contributor: "協力者・編者"
358
- publisher: "出版者"
359
- owner: "所有者"
360
- library:
361
- map: "地図"
362
- staff: "職員"
363
- number_of_item: "所蔵冊数"
364
- address: "住所"
365
294
  import:
366
295
  from_file: "ファイルから"
367
296
  from_isbn: "ISBNから"
@@ -446,3 +375,5 @@ ja:
446
375
  user_import_file:
447
376
  default_user_group: TSVファイルで"user_group"列が指定されていない場合、この利用者グループが登録されます。
448
377
  default_library: TSVファイルで"library"列が指定されていない場合、この図書館が登録されます。
378
+ profile:
379
+ no_number: 番号なし
@@ -9,6 +9,9 @@ module MasterModel
9
9
  validate :name do
10
10
  valid_format?
11
11
  end
12
+ validate :display_name do
13
+ valid_yaml?
14
+ end
12
15
  validates :display_name, presence: true
13
16
  before_validation :set_display_name, on: :create
14
17
  normalize_attributes :name
@@ -26,5 +29,13 @@ module MasterModel
26
29
  errors.add(:name, I18n.t('page.only_lowercase_letters_and_numbers_are_allowed'))
27
30
  end
28
31
  end
32
+
33
+ def valid_yaml?
34
+ begin
35
+ YAML.load(display_name)
36
+ rescue Psych::SyntaxError
37
+ errors.add(:display_name, I18n.t('page.cannot_parse_yaml_header'))
38
+ end
39
+ end
29
40
  end
30
41
  end
@@ -210,7 +210,7 @@ module EnjuLeaf
210
210
  end
211
211
  end
212
212
 
213
- def deletable_by(current_user)
213
+ def deletable_by?(current_user)
214
214
  if defined?(EnjuCirculation)
215
215
  # 未返却の資料のあるユーザを削除しようとした
216
216
  if checkouts.count > 0
@@ -1,3 +1,3 @@
1
1
  module EnjuLeaf
2
- VERSION = "1.1.0.rc13"
2
+ VERSION = "1.1.0.rc14"
3
3
  end
@@ -9,6 +9,14 @@ Sunspot.session = Sunspot::Rails::StubSessionProxy.new(Sunspot.session)
9
9
  # raise "Solr is not running."
10
10
  #end
11
11
 
12
+ def new_profile
13
+ profile = Profile.new
14
+ profile.user_group = UserGroup.first
15
+ profile.library = Library.real.first
16
+ profile.locale = I18n.default_locale.to_s
17
+ profile
18
+ end
19
+
12
20
  #Patron.reindex
13
21
  #Library.reindex
14
22
  #Shelf.reindex
@@ -17,9 +25,12 @@ system_user = User.new
17
25
  system_user.username = 'system'
18
26
  system_user.password = SecureRandom.urlsafe_base64(32)
19
27
  system_user.email = system_user.email_confirmation = 'root@library.example.jp'
28
+ system_user.role = Role.where(name: 'Administrator').first
20
29
  system_user.save!
21
- system_user.role = Role.where(:name => 'Administrator').first
22
- system_user.index
30
+ system_profile = new_profile
31
+ system_profile.user = system_user
32
+ system_profile.save!
33
+ system_profile.index
23
34
 
24
35
  user = User.new
25
36
  user.username = username
@@ -27,14 +38,14 @@ user.email = email
27
38
  user.email_confirmation = email
28
39
  user.password = password
29
40
  user.password_confirmation = password
30
- user.profile = Profile.new
31
- user.profile.library = Library.real.first
32
- user.profile.locale = I18n.default_locale.to_s
33
- user.profile.user_number = '0'
34
41
  user.operator = user
35
- user.save!
36
42
  #user.confirm!
37
- user.role = Role.where(:name => 'Administrator').first
38
- user.index
43
+ user.role = Role.where(name: 'Administrator').first
44
+ user.save!
45
+ profile = new_profile
46
+ profile.user_number = '0'
47
+ profile.user = user
48
+ profile.save!
49
+ profile.index
39
50
  Sunspot.commit
40
51
  puts 'Administrator account created.'
@@ -23,10 +23,11 @@ namespace :enju_leaf do
23
23
  task :upgrade => :environment do
24
24
  version = EnjuLeaf::VERSION.split('.')
25
25
  if version[0..2] == ["1", "1" ,"0"]
26
- if version[3] == 'rc13'
26
+ if version[3] == 'rc14'
27
27
  Rake::Task['enju_biblio:upgrade'].invoke
28
28
  Rake::Task['enju_circulation:upgrade'].invoke
29
29
  Rake::Task['enju_message:upgrade'].invoke
30
+ Rake::Task['enju_subject:upgrade'].invoke
30
31
  Profile.transaction do
31
32
  update_profile
32
33
  end
@@ -59,3 +59,4 @@ end
59
59
 
60
60
  require 'enju_circulation'
61
61
  require 'enju_bookmark'
62
+ require 'enju_search_log'
Binary file
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
@@ -0,0 +1,8 @@
1
+ username email user_number role user_group library locale created_at updated_at expired_at keyword_list note checkout_icalendar_token save_checkout_history save_search_history share_bookmarks
2
+ admin tanabe@kamata.lib.teu.ac.jp 00001 Administrator user kamata en 2007-11-19 07:58:32 UTC 2008-05-31 04:16:30 UTC false false
3
+ librarian1 librarian1@kamata.lib.teu.ac.jp 00002 Librarian not_specified web ja 2007-11-19 07:58:33 UTC 2008-05-31 03:41:16 UTC false false
4
+ user1 user1@kamata.lib.teu.ac.jp 00003 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
5
+ librarian2 librarian2@library.example.jp 00004 Librarian not_specified kamata ja 2008-01-18 03:24:04 UTC 2008-05-31 03:42:23 UTC false false
6
+ user2 user2@library.example.jp User not_specified web ja 2008-01-18 04:29:06 UTC 2008-05-31 03:42:44 UTC false false
7
+ user3 user3@kamata.lib.teu.ac.jp 00006 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false
8
+ user4 user4@kamata.lib.teu.ac.jp 00007 User not_specified kamata ja 2007-11-19 07:58:34 UTC 2008-05-31 04:02:25 UTC false false