bookyt_salary 0.9.0 → 0.9.1

data/app/controllers/salary_templates_controller.rb

@@ -3,7 +3,8 @@ class SalaryTemplatesController < AuthorizedController
     # Duplicate original record
     template = resource.dup
 
-    # Rebuild positions
+    # Rebuild salary items
+    template.salary_items = resource.salary_items.map{|salary_item| salary_item.dup}
     set_resource_ivar template
 
     render 'edit'
@@ -17,9 +18,7 @@ class SalaryTemplatesController < AuthorizedController
       @salary_template = resource_class.new
     end
 
-    @salary_item = @salary_template.salary_items.build(
-      :times          => 1
-    )
+    @salary_item = @salary_template.salary_items.build
 
     respond_with @salary_item
   end

data/app/models/salary_template.rb

@@ -4,4 +4,8 @@ class SalaryTemplate < ActiveRecord::Base
   # Salary Items
   has_many :salary_items
   accepts_nested_attributes_for :salary_items, :allow_destroy => true
+
+  def to_s
+    title
+  end
 end

data/app/views/salary_templates/show.html.haml

@@ -0,0 +1,8 @@
+.contextual
+  = contextual_link_to :copy
+  = contextual_links_for
+
+.page-header
+  %h1= resource
+
+= render 'form'

data/config/routes.rb

@@ -8,6 +8,10 @@ Rails.application.routes.draw do
 
   resources :salary_templates do
     member do
+      get :copy
+      get :new_salary_item
+    end
+    collection do
       get :new_salary_item
     end
   end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -129,6 +129,7 @@ files:
 - app/views/salary_templates/_salary_item_form.html.haml
 - app/views/salary_templates/_salary_template.html.haml
 - app/views/salary_templates/new_salary_item.js.erb
+- app/views/salary_templates/show.html.haml
 - config/application.rb
 - config/boot.rb
 - config/locales/bookyt_salary.de.yml
@@ -174,9 +175,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
 
+has_rdoc: