bookyt_projects 0.19.20 → 0.19.21

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

@@ -1,7 +1,7 @@
 = simple_form_for @activity do |f|
   .row-fluid
-    .span6= f.input :person, :as => :combobox
-    .span6= f.input :project, :as => :combobox
+    .span6= f.association :person, :as => :combobox
+    .span6= f.association :project, :as => :combobox
   .row-fluid
     .span6= f.input :date, :as => :date_field
     .span6= f.input :duration, :as => :string

data/app/views/people/_show_activities.html.haml

@@ -1 +1,7 @@
-= render 'activities/list', :collection => resource.activities
+- @activities = resource.activities
+- if @activities.empty?
+  = boot_alert(t('activities.alerts.empty'))
+  .activities.collection
+
+- else
+  = render 'activities/list', :collection => resource.activities unless @activities.empty?

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

@@ -3,7 +3,7 @@
     .span6
       = f.input :name, :input_html => {'data-autofocus' => 'true'}
       = f.input :duration_from, :as => :date_field
-      = f.input :client, :as => :combobox
+      = f.association :client, :as => :combobox
     .span6
       = f.input :project_state
       = f.input :duration_to, :as => :date_field

data/app/views/projects/_show_activities.html.haml

@@ -1,5 +1,10 @@
+- @activities = resource.activities
+- if @activities.empty?
+  = boot_alert(t('activities.alerts.empty'))
+  .activities.collection
+
+- else
+  = render 'activities/list', :collection => @project.activities unless @activities.empty?
+
 .contextual
   = icon_link_to :new, new_project_activity_path(resource)
-= boot_page_title :index, Activity
-
-= render 'activities/list', :collection => @project.activities

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.19.20'
+  VERSION = '0.19.21'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: 
   segments: 
   - 0
   - 19
-  - 20
-  version: 0.19.20
+  - 21
+  version: 0.19.21
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails