Skip to content

O
OHR Support
Commit 6863c003 authored by Tim Felgentreff's avatar Tim Felgentreff
Browse files
Options

forgot a few versioned => journaled conversions

parent 3279b2ad
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
app/models/document.rb
View file @ 6863c003
...@@ -21,7 +21,7 @@ class Document < ActiveRecord::Base ...@@ -21,7 +21,7 @@ class Document < ActiveRecord::Base
acts_as_attachable :delete_permission => :manage_documents acts_as_attachable :delete_permission => :manage_documents
acts_as_journalized :event_title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"}, acts_as_journalized :event_title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
:event_url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.versioned_id}}, :event_url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.journaled_id}},
:event_author => (Proc.new do |o| :event_author => (Proc.new do |o|
o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC").try(:author) o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC").try(:author)
end) end)
......
app/models/mail_handler.rb
View file @ 6863c003
...@@ -197,8 +197,8 @@ class MailHandler < ActionMailer::Base ...@@ -197,8 +197,8 @@ class MailHandler < ActionMailer::Base
# Reply will be added to the issue # Reply will be added to the issue
def receive_journal_reply(journal_id) def receive_journal_reply(journal_id)
journal = Journal.find_by_id(journal_id) journal = Journal.find_by_id(journal_id)
if journal and journal.versioned.is_a? Issue if journal and journal.journaled.is_a? Issue
receive_issue_reply(journal.versioned_id) receive_issue_reply(journal.journaled_id)
end end
end end
......
app/models/news.rb
View file @ 6863c003
...@@ -24,7 +24,7 @@ class News < ActiveRecord::Base ...@@ -24,7 +24,7 @@ class News < ActiveRecord::Base
validates_length_of :title, :maximum => 60 validates_length_of :title, :maximum => 60
validates_length_of :summary, :maximum => 255 validates_length_of :summary, :maximum => 255
acts_as_journalized :event_url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.versioned_id} } acts_as_journalized :event_url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.journaled_id} }
acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
def visible?(user=User.current) def visible?(user=User.current)
......
app/views/search/index.rhtml
View file @ 6863c003
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
<h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3> <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
<dl id="search-results"> <dl id="search-results">
<% @results.each do |e| %> <% @results.each do |e| %>
<dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), e.event_url %></dt> <dt class="<%= e.event_type %>">
<%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %>
<%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), e.event_url %>
</dt>
<dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span> <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
<span class="author"><%= format_time(e.event_datetime) %></span></dd> <span class="author"><%= format_time(e.event_datetime) %></span></dd>
<% end %> <% end %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment