gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2

Browse source
This commit is contained in:
Chrisbr 2014-05-13 13:43:06 +02:00
commit 147310b8b7
12 changed files with 59 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
config/application.rb
config/config.yml
config/secrets.yml
config/database.yml
/vendor/cache
/vendor/cache-old

1
.travis.yml
View file

@ -14,6 +14,7 @@ before_install:
before_script:
- cp config/database.yml.example config/database.yml
- cp config/config.yml.example config/config.yml
- cp config/secrets.yml.example config/secrets.yml
- RAILS_ENV=test bundle exec rake db:migrate --trace
script:
- bundle exec rspec --color --format documentation

3
app/controllers/admin/events_controller.rb
View file

@ -113,12 +113,10 @@ class Admin::EventsController < ApplicationController
flash[:notice] = "Update not successful."
end
expire_page :controller => '/schedule', :action => :index
redirect_back_or_to(admin_conference_event_path(@conference.short_title, @event))
end
def create
expire_page :controller => '/schedule', :action => :index
end
def update_state
@ -127,7 +125,6 @@ class Admin::EventsController < ApplicationController
redirect_to(admin_conference_events_path(:conference_id => @conference.short_title), :notice => "Update Email Template before Sending Mails") and return
end
event.send(:"#{params[:transition]}!", :send_mail => params[:send_mail])
expire_page :controller => '/schedule', :action => :index
redirect_to(admin_conference_events_path(:conference_id => @conference.short_title), :notice => "Updated state")
end

1
app/controllers/admin/schedule_controller.rb
View file

@ -47,7 +47,6 @@ class Admin::ScheduleController < ApplicationController
startTime = DateTime.strptime(time, "%Y-%m-%d %k:%M")
event.start_time = startTime
event.save!
expire_page :controller => '/schedule', :action => :index
render :json => {"status" => "ok"}
end

41
app/views/admin/events/index.html.haml
View file

@ -106,26 +106,35 @@
<b class="caret"></b>
%ul.dropdown-menu
- if event.transition_possible? :accept
%li= link_to "Accept event (no email)", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :accept, :send_mail => false),
:method => :put, :hint => "Accept this event without sending an automated email."
%li= link_to "Accept event (WITH email)", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :accept, :send_mail => true),
:method => :put, :hint => "Accept this event and send an automated email."
%li= link_to 'Accept event (no email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: false),
method: :patch, hint: 'Accept this event without sending an automated email.'
%li= link_to 'Accept event (WITH email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: true),
method: :patch, hint: 'Accept this event and send an automated email.'
- if event.transition_possible? :reject
%li= link_to "Reject event (no email)", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :reject, :send_mail => false),
:method => :put, :confirm => "Are you sure?",
:hint => "Reject this event without sending an automated email."
%li= link_to "Reject event (WITH email)", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :reject, :send_mail => true),
:method => :put, :confirm => "Are you sure?",
:hint => "Reject this event and send an automated email."
%li= link_to 'Reject event (no email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: false),
method: :patch, confirm: 'Are you sure?',
hint: 'Reject this event without sending an automated email.'
%li= link_to 'Reject event (WITH email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: true),
method: :patch, confirm: 'Are you sure?',
hint: 'Reject this event and send an automated email.'
- if event.transition_possible? :start_review
%li= link_to "Start review", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :start_review),
:method => :put
%li= link_to 'Start review',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :start_review),
method: :patch
- if event.transition_possible? :confirm
%li= link_to "Confirm event", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :confirm),
:method => :put, :hint => "Confirm that the speaker(s) will be present and that the event will actually take place."
%li= link_to 'Confirm event',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :confirm),
method: :patch,
hint: 'Confirm that the speaker(s) will be present and that the event will actually take place.'
- if event.transition_possible? :cancel
%li= link_to "Cancel event", update_state_admin_conference_event_path(@conference.short_title, event, :transition => :cancel),
:method => :put, :hint => "Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance."
%li= link_to 'Cancel event',
update_state_admin_conference_event_path(@conference.short_title, event, :transition => :cancel),
method: :patch,
hint: 'Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance.'
:javascript
$(document).ready(function() {

9
app/views/proposal/index.html.haml
View file

@ -28,7 +28,8 @@
%td
.pull-right
- if event.transition_possible? :confirm
= link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, event, :send_mail=>false), :method => :put, :class => "btn btn-mini btn-success"
= link_to "Edit", edit_conference_proposal_path(@conference.short_title, event.id), :class => "btn btn-mini btn-primary"
= link_to "Withdraw", conference_proposal_path(@conference.short_title, event.id), :method => :delete,
:confirm => "Are you sure you want to withdraw this proposal?", :class => "btn btn-mini btn-danger"
= link_to 'Confirm',
conference_proposal_confirm_path(@conference.short_title, event, send_mail: false), method: :patch, class: 'btn btn-mini btn-success'
= link_to 'Edit', edit_conference_proposal_path(@conference.short_title, event.id), class: 'btn btn-mini btn-primary'
= link_to 'Withdraw', conference_proposal_path(@conference.short_title, event.id), method: :delete,
confirm: 'Are you sure you want to withdraw this proposal?', class: 'btn btn-mini btn-danger'

7
config/config.yml.example
View file

@ -5,14 +5,9 @@ defaults: &defaults
devise_mail_sender: "no-reply@localhost"
# The hostname to be used when building the URL in the emails
url_for_emails: "localhost:3000"
# A secret key for your rails app. You can generate one with 'rake secret'
secret_key: 12345
# A secret key. You can generate one with 'rake secret'
devise_secret_key: '12345'
# errbit configuration, get your own instance: https://github.com/errbit/errbit
#errbit_key: 123456789101112131415
#errbit_key: See config/secrets.yml
#errbit_host: errbit.exmaple.com
cookies_secret_token: 'secretstringwhichshouldbechanged'
development:
<<: *defaults

1
config/environment.rb
View file

@ -12,4 +12,3 @@ end
# Initialize the rails application
Osem::Application.initialize!
Osem::Application.config.secret_keybase = CONFIG['secret_key']

2
config/initializers/devise.rb
View file

@ -2,7 +2,7 @@
# Many of these configuration options can be set straight in your model.
Devise.setup do |config|
# ==> Secret key, generate one with `rake secret`
config.secret_key = CONFIG['devise_secret_key']
config.secret_key = Rails.application.secrets.devise_secret_key
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,

10
config/initializers/hoptoad.rb
View file

@ -1,11 +1,11 @@
HoptoadNotifier.configure do |config|
# Change this to some sensible data for your errbit instance
config.api_key = CONFIG["errbit_key"] || ""
config.host = CONFIG["errbit_host"] || ""
config.api_key = Rails.application.secrets.errbit_key || ''
config.host = CONFIG['errbit_host'] || ''
if config.api_key.blank? || config.host.blank?
config.development_environments = "production development test"
config.development_environments = 'production development test'
else
config.development_environments = "development test"
config.development_environments = 'development test'
end
config.ignore_only = %w{
@ -14,7 +14,7 @@ HoptoadNotifier.configure do |config|
config.ignore_by_filter do |exception_data|
ret=false
if exception_data[:error_class] == "ActionController::RoutingError"
if exception_data[:error_class] == 'ActionController::RoutingError'
message = exception_data[:error_message]
ret=true if message =~ %r{\[GET\]}
end

7
config/initializers/secret_token.rb
View file

@ -1,7 +0,0 @@
# Be sure to restart your server when you modify this file.
# Your secret key for verifying the integrity of signed cookies.
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
Osem::Application.config.secret_token = CONFIG['cookies_secret_token']

20
config/secrets.yml.example Normal file
View file

@ -0,0 +1,20 @@
defaults: &defaults
# You can generate secret keys with 'rake secret'
# For rails cookies
secret_key_base: '12345'
# For devise login tokens
devise_secret_key: '12345'
# Your errbit API key
# errbit_key: '12345'
development:
<<: *defaults
test:
<<: *defaults
production:
<<: *defaults