Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added button for deleting proposals from organizer view #1

Merged
merged 1 commit into from
Oct 19, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/views/organizer/proposals/_proposal.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
%td= proposal.review_tags
%td.status= proposal.state_label(small: true, show_confirmed: true)
%td.actions= proposal.small_state_buttons
%td
=button_to 'Delete Proposal', organizer_event_proposal_path(event_id: @event, uuid: proposal.uuid), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this proposal?'}, :class => "btn btn-primary btn-sm"
1 change: 1 addition & 0 deletions app/views/organizer/proposals/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@
%th Reviewer Tags
%th Status
%th.actions Soft Actions (Internal)
%th
%tbody
= render proposals
63 changes: 55 additions & 8 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,64 @@
default: &default
# PostgreSQL. Versions 8.2 and up are supported.
#
# Install the pg driver:
# gem install pg
# On OS X with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows:
# gem install pg
# Choose the win32 build.
# Install PostgreSQL and put its /bin directory on your path.
#
# Configure Using Gemfile
# gem 'pg'
#
development:
adapter: postgresql
encoding: unicode
database: cfp_app_development
pool: 5
username: postgres
password: password
host: localhost

development:
<<: *default
database: cfp_app_development
# Connect on a TCP socket. Omitted by default since the client uses a
# domain socket that doesn't need configuration. Windows does not have
# domain sockets, so uncomment these lines.
#host: localhost

# The TCP port the server listens on. Defaults to 5432.
# If your server runs on a different port number, change accordingly.
#port: 5432

# Schema search path. The server defaults to $user,public
#schema_search_path: myapp,sharedapp,public

# Minimum log levels, in increasing order:
# debug5, debug4, debug3, debug2, debug1,
# log, notice, warning, error, fatal, and panic
# Defaults to warning.
#min_messages: notice

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
adapter: postgresql
encoding: unicode
database: cfp_app_test

pool: 5
username: postgres
password: password
host: localhost

production:
url: <%= ENV["DATABASE_URL"] %>
pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
adapter: postgresql
encoding: unicode
database: cfp_app_production
pool: 5
username: postgres
password: password
host: localhost