Added validation on subject. Fixed failed save. #1135

This commit is contained in:
Eric Davis committed 2008-05-20 23:34:36 -07:00
1 parent bebb2ff15b
commit bd5bb6d1c5
6 files changed
+12 -4

No files matched your search

+1 -1
View File
@@ -40,7 +40,7 @@ class DeliverablesController < ApplicationController
format.html { redirect_to :action => 'index' } format.html { redirect_to :action => 'index' }
format.js { render :action => 'create.js.rjs'} format.js { render :action => 'create.js.rjs'}
else else
# TODO: Failed save format.js { render :action => 'create_error.js.rjs'}
end end
end end
+2 -1
View File
@@ -1,6 +1,7 @@
class Deliverable < ActiveRecord::Base class Deliverable < ActiveRecord::Base
unloadable unloadable
validates_presence_of :subject
belongs_to :project belongs_to :project
attr_accessor :overhead attr_accessor :overhead
+1 -1
View File
@@ -7,7 +7,7 @@
<div class="box"> <div class="box">
<div class="splitcontentleft"> <div class="splitcontentleft">
<p><%= f.text_field :subject, :size => 65, :required => true %></p> <p><%= f.text_field :subject, :size => 65, :required => true %></p>
<p><%= f.text_area :description, :required => true, <p><%= f.text_area :description,
:cols => 60, :cols => 60,
:rows => (@deliverable.description.blank? ? 10 : [[10, @deliverable.description.length / 50].max, 100].min), :rows => (@deliverable.description.blank? ? 10 : [[10, @deliverable.description.length / 50].max, 100].min),
:accesskey => accesskey(:edit), :accesskey => accesskey(:edit),
+1
View File
@@ -10,6 +10,7 @@ page.select('#errorExplanation').each do |value|
end end
page << "Form.reset($('deliverable-form'))" page << "Form.reset($('deliverable-form'))"
page << "Budget.updateAmounts()"
# Add a fading out flash # Add a fading out flash
page.insert_html :before, 'new-deliverable', content_tag(:div, @flash, :class => "flash notice", :id => 'rjs-flash') page.insert_html :before, 'new-deliverable', content_tag(:div, @flash, :class => "flash notice", :id => 'rjs-flash')
@@ -0,0 +1,2 @@
page.replace_html 'new-deliverable', :partial => 'form'
page << "Budget.updateAmounts()"
+5 -1
View File
@@ -1,8 +1,12 @@
require File.dirname(__FILE__) + '/../spec_helper' require File.dirname(__FILE__) + '/../spec_helper'
describe Deliverable do describe Deliverable do
it "should not be valid without subject" do
Deliverable.new.should_not be_valid
end
it "should be valid" do it "should be valid" do
Deliverable.new.should be_valid Deliverable.new({ :subject => 'test' }).should be_valid
end end
end end