bookyt_projects 0.6.1 → 0.6.3

data/Gemfile.lock

@@ -79,7 +79,7 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.3

data/app/controllers/activities_controller.rb

@@ -1,12 +1,12 @@
 class ActivitiesController < AuthorizedController
-  belongs_to :project
+  belongs_to :project, :optional => true
 
   def new
     # Allow callers specifying defaults
     if params[:activity]
       @activity = Activity.new(params[:activity])
     else
-      @activity = Activity.new
+      @activity = Activity.new(:when => Date.today)
     end
 
     # Nested resources support
@@ -14,16 +14,11 @@ class ActivitiesController < AuthorizedController
     # Educated guessing of defaults
     @activity.person = current_user.person if current_user
 
-    @project ||= Project.new
-    
     new!
   end
 
   def create
-    @activity = Activity.create(params[:activity])
-    @project = @activity.project
-
-    create! { project_path(@project) }
+    create! { @activity.project }
   end
 
   def index

data/app/models/activity.rb

@@ -4,9 +4,9 @@ class Activity < ActiveRecord::Base
   
   attr_accessor :minutes, :hours
   
-  validates :project, :presence => true
-  validates :person,  :presence => true
-  validates :when,    :presence => true
+  validates :project, :presence => true, :allow_blank => false
+  validates :person,  :presence => true, :allow_blank => false
+  validates_date :when, :allow_nil => false, :allow_blank => false
   validates :from,    :presence => true, :unless => :hours_minutes
   validates :to,      :presence => true, :unless => :hours_minutes
   validates_numericality_of :hours,   :only_integer => true, :unless => :from

data/app/views/activities/_form.html.haml

@@ -3,7 +3,7 @@
     = f.input :person
     = f.input :project
   = f.inputs do
-    = f.input :when, :as => :date_field
+    = f.input :when, :as => :date_field, :required => true
     = f.input :from, :as => :hour_field
     = f.input :to, :as => :hour_field
     = f.input :hours

data/bookyt_projects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookyt_projects}
-  s.version = "0.6.1"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roman Simecek}]
-  s.date = %q{2011-10-10}
+  s.date = %q{2011-10-11}
   s.description = %q{Rails engine for project management it's used to extend the functionallity of bookyt.}
   s.email = %q{roman.simecek@cyt.ch}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Roman Simecek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 Z
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement