Skip to content

Commit

Permalink
add as-delete markup
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Hansen committed Jul 28, 2010
1 parent 8cd4e86 commit 9b2a784
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
8 changes: 6 additions & 2 deletions app/models/deal.rb
Expand Up @@ -8,6 +8,10 @@ class Deal < ActiveRecord::Base
has_many :users, :through => :deal_users
has_many :deal_organizations
has_many :organizations, :through => :deal_organizations
has_many :favorites, :as => :favorable
has_many :model_documents, :as => :documentable
has_many :notes, :as => :notable
has_many :group_members, :as => :groupable

SEARCH_ATTRIBUTES = [:description]

Expand Down Expand Up @@ -81,14 +85,14 @@ def self.deal_chain_states
end

aasm_event :win do
transitions :from => :negotiating, :to => :win
transitions :from => :negotiating, :to => :won
end

aasm_event :backburner do
transitions :from => :negotiating, :to => :backburnered
end

aasm_event :reopen do
transitions :from => TERMINAL_STATES, :to => :backburnered
transitions :from => TERMINAL_STATES, :to => :new
end
end
Expand Up @@ -8,7 +8,7 @@
- if(model.deal_organizations.size > 0)
- model.deal_organizations.each do |deal_org|
%div= deal_org.organization.name
= link_to_delete 'delete', deal_org, {:class => 'fluxx-card-form-on-complete-refresh', :method => :delete}
%span.delete-button= link_to image_tag("/fluxx_engine/theme/default/images/icons/delete.png"), deal_org, {:class => 'as-delete'}

<br clear="all"/>

Expand Down
3 changes: 1 addition & 2 deletions app/views/deal_users/_list_deal_users.html.haml
Expand Up @@ -8,8 +8,7 @@
- if(model.deal_users.size > 0)
- model.deal_users.each do |deal_user|
%div= deal_user.user.full_name
= link_to_delete 'delete', deal_user, {:class => 'fluxx-card-form-on-complete-refresh', :method => :delete}

%span.delete-button= link_to image_tag("/fluxx_engine/theme/default/images/icons/delete.png"), deal_user, {:class => 'as-delete'}
<br clear="all"/>

- else
Expand Down
5 changes: 5 additions & 0 deletions app/views/deals/_deal_show.html.haml
Expand Up @@ -9,3 +9,8 @@

= render :partial => "deal_organizations/list_deal_organizations", :locals => { :model => model}
= render :partial => "deal_users/list_deal_users", :locals => { :model => model}

= render :partial => "model_documents/list_model_documents", :locals => { :model => model}
= render :partial => "group_members/list_group_members", :locals => { :model => @model, :class_type => Organization.name}
= render :partial => "notes/list_notes", :locals => { :model => @model, :class_type => Organization.name}
= render :partial => "audits/list_audits", :locals => { :model => @model}

0 comments on commit 9b2a784

Please sign in to comment.