diff --git a/app/controllers/contracts_controller.rb b/app/controllers/contracts_controller.rb index cac1619..5e5124e 100644 --- a/app/controllers/contracts_controller.rb +++ b/app/controllers/contracts_controller.rb @@ -35,6 +35,7 @@ class ContractsController < ApplicationController # GET /contracts/1/edit def edit @contract = Contract.find(params[:id]) + redirect_to(@contract, :notice => 'Contracts cannot be edited.') end # POST /contracts @@ -80,11 +81,11 @@ class ContractsController < ApplicationController # DELETE /contracts/1.xml def destroy @contract = Contract.find(params[:id]) - @contract.destroy + #@contract.destroy respond_to do |format| - format.html { redirect_to(contracts_url) } - format.xml { head :ok } + format.html { redirect_to(@contract, :notice => 'Contracts cannot be deleted.') } + format.xml { render :xml => @contract.errors, :status => :unprocessable_entity } end end end diff --git a/app/views/contracts/show.html.erb b/app/views/contracts/show.html.erb index 1ecdb5d..54c5f44 100644 --- a/app/views/contracts/show.html.erb +++ b/app/views/contracts/show.html.erb @@ -1,11 +1,11 @@
- First Name: + Name: <%= @contract.signer.first_name %> <%= @contract.signer.last_name %>
Minor: - <%= @contract.signer.cosigner %> + <%= if @contract.signer.cosigner.blank? then "n/a" else @contract.signer.cosigner end %>
@@ -26,6 +26,7 @@ Verification: <%=Digest::SHA1.hexdigest @contract.boilerplate+@contract.signature+@contract.datesigned.to_s%>
- + diff --git a/app/views/layouts/contract_templates.html.erb b/app/views/layouts/application.html.erb similarity index 88% rename from app/views/layouts/contract_templates.html.erb rename to app/views/layouts/application.html.erb index 1caf1ad..5fd3977 100644 --- a/app/views/layouts/contract_templates.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,9 +6,10 @@