enju_event 0.1.17.pre25 → 0.1.17.pre26

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a0b73cb1eeaca0ba46596db500ebe25e5e9f9d02
4
- data.tar.gz: 3fb9ca29821157e8ec8a7c7a1ef0eba968b87bc8
3
+ metadata.gz: 952d9e4be45acb984585b9ca979adee42fd6f4b8
4
+ data.tar.gz: d0a8884b4b50f4acc1f6d3e7a23998be47df2283
5
5
  SHA512:
6
- metadata.gz: 9088359922f0543e13076fb09ac5fb4ede02dff85411481f9b3099ccc2dea6a38f9926ffeb900412305e9ab59cacadbdb02d9818bbc6810778967a399c89be55
7
- data.tar.gz: 48c4f9d2eb9c332204863be0080bdc658c320e240277593e5ce9d035fb8fef8ef97e10516344b347cd9ebea6351099212d5b0a78b06da4543d7d46aa15acbe39
6
+ metadata.gz: 1baecb169b72d269d100c809145659f76e63fd2778901bcd281088d09588d01e8a4e0fe713128971ca7d123385787cb5b2f18e8d2a726fb2994a9c630c3ffd91
7
+ data.tar.gz: 927a4f5952b53547e3d28772b8ee0e461db9e83db2de2426a6629e41fcb4a9c0de9ad832a160d580f83ce6c5707f7454dd95f30cf99a881890197570f094c8ca
@@ -1,4 +1,4 @@
1
- Copyright 2012 Kosuke Tanabe
1
+ Copyright 2015 Project Next-L
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -23,7 +23,9 @@
23
23
 
24
24
  <div id="submenu" class="ui-corner-all ui-widget-content">
25
25
  <ul>
26
- <li><%= link_to t('page.edit'), edit_event_category_path(@event_category) -%></li>
26
+ <%- if can? :update, @event_category -%>
27
+ <li><%= link_to t('page.edit'), edit_event_category_path(@event_category) -%></li>
28
+ <%- end -%>
27
29
  <li><%= back_to_index(flash[:page_info]) -%></li>
28
30
  </ul>
29
31
  </div>
@@ -1,17 +1,7 @@
1
1
  <%= form_for(@event_export_file) do |f| %>
2
2
  <%= f.error_messages %>
3
3
 
4
- <%= f.hidden_field :mode, value: 'export' if @event_export_file.new_record? %><br>
5
- <!--
6
- <div class="field">
7
- <%= f.label :user_id %><br>
8
- <%= @event_export_file.user.username %>
9
- </div>
10
- <div class="field">
11
- <%= f.label :event_export %><br>
12
- <%= f.text_field :event_export %>
13
- </div>
14
- -->
4
+ <%= f.hidden_field :mode, value: 'export' if @event_export_file.new_record? %>
15
5
  <div class="actions">
16
6
  <% if @event_export_file.new_record? %>
17
7
  <%= f.submit t('page.export') %>
@@ -18,6 +18,11 @@
18
18
  <%= localized_state(@event_export_file.current_state) -%>
19
19
  </p>
20
20
 
21
+ <p>
22
+ <strong><%= t('page.created_at') -%>:</strong>
23
+ <%= l(@event_export_file.created_at) if @event_export_file.created_at -%>
24
+ </p>
25
+
21
26
  </div>
22
27
  </div>
23
28
 
@@ -1,3 +1,3 @@
1
1
  module EnjuEvent
2
- VERSION = "0.1.17.pre25"
2
+ VERSION = "0.1.17.pre26"
3
3
  end
@@ -1,7 +1,7 @@
1
1
  class User < ActiveRecord::Base
2
2
  # Include default devise modules. Others available are:
3
3
  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
4
- devise :database_authenticatable, :registerable,
4
+ devise :database_authenticatable, #:registerable,
5
5
  :recoverable, :rememberable, :trackable, :validatable
6
6
 
7
7
  # Setup accessible (or protected) attributes for your model
@@ -2,7 +2,6 @@ FactoryGirl.define do
2
2
  factory :admin, :class => User do |f|
3
3
  f.sequence(:username){|n| "admin_#{n}"}
4
4
  f.sequence(:email){|n| "admin_#{n}@example.jp"}
5
- f.email_confirmation{|u| u.email}
6
5
  f.password 'adminpassword'
7
6
  f.password_confirmation 'adminpassword'
8
7
  f.after(:create) do |user|
@@ -16,7 +15,6 @@ FactoryGirl.define do
16
15
  factory :librarian, :class => User do |f|
17
16
  f.sequence(:username){|n| "librarian_#{n}"}
18
17
  f.sequence(:email){|n| "librarian_#{n}@example.jp"}
19
- f.email_confirmation{|u| u.email}
20
18
  f.password 'librarianpassword'
21
19
  f.password_confirmation 'librarianpassword'
22
20
  f.after(:create) do |user|
@@ -30,7 +28,6 @@ FactoryGirl.define do
30
28
  factory :user, :class => User do |f|
31
29
  f.sequence(:username){|n| "user_#{n}"}
32
30
  f.sequence(:email){|n| "user_#{n}@example.jp"}
33
- f.email_confirmation{|u| u.email}
34
31
  f.password 'userpassword'
35
32
  f.password_confirmation 'userpassword'
36
33
  f.after(:create) do |user|
@@ -7,6 +7,11 @@ one:
7
7
  note:
8
8
  my_networks: 0.0.0.0/0
9
9
  url: "http://localhost:3000/"
10
+ settings: <% if Rails::VERSION::MAJOR > 3 %>
11
+ "{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
12
+ <% else %>
13
+ "---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
14
+ <% end %>
10
15
 
11
16
 
12
17
  # == Schema Information
@@ -34,7 +34,7 @@ describe EventImportFile do
34
34
  @file.executed_at.should be_truthy
35
35
 
36
36
  @file.reload
37
- @file.error_message.should eq "The follwing column(s) were ignored: invalid"
37
+ @file.error_message.should eq "The following column(s) were ignored: invalid"
38
38
  end
39
39
 
40
40
  it "should send message when import is completed" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_event
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.17.pre25
4
+ version: 0.1.17.pre26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-09 00:00:00.000000000 Z
11
+ date: 2015-06-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_message
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.14.pre22
19
+ version: 0.1.14.pre24
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.14.pre22
26
+ version: 0.1.14.pre24
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: simple_form
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '3.2'
145
+ version: '3.3'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: '3.2'
152
+ version: '3.3'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: factory_girl_rails
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
170
170
  requirements:
171
171
  - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: 1.1.0.rc17
173
+ version: 1.1.0.rc19
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: 1.1.0.rc17
180
+ version: 1.1.0.rc19
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: sunspot_solr
183
183
  requirement: !ruby/object:Gem::Requirement
@@ -374,7 +374,6 @@ files:
374
374
  - spec/dummy/app/controllers/application_controller.rb
375
375
  - spec/dummy/app/helpers/application_helper.rb
376
376
  - spec/dummy/app/models/ability.rb
377
- - spec/dummy/app/models/setting.rb
378
377
  - spec/dummy/app/models/user.rb
379
378
  - spec/dummy/app/views/layouts/application.html.erb
380
379
  - spec/dummy/bin/bundle
@@ -658,7 +657,6 @@ test_files:
658
657
  - spec/dummy/app/controllers/application_controller.rb
659
658
  - spec/dummy/app/helpers/application_helper.rb
660
659
  - spec/dummy/app/models/ability.rb
661
- - spec/dummy/app/models/setting.rb
662
660
  - spec/dummy/app/models/user.rb
663
661
  - spec/dummy/app/views/layouts/application.html.erb
664
662
  - spec/dummy/bin/bundle
@@ -1,4 +0,0 @@
1
- class Setting < Settingslogic
2
- source "#{Rails.root}/config/application.yml"
3
- namespace Rails.env
4
- end