diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1ea358a37..43bc6537d 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -56,7 +56,10 @@ class Issue < ActiveRecord::Base
:include => [:project, :visible_journals],
# sort by id so that limited eager loading doesn't break with postgresql
:order_column => "#{table_name}.id"
- acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
+ acts_as_event :title => Proc.new {|o|
+ #"#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"
+ "#{o.tracker.name} #{o.source_from} (#{o.status}): #{o.subject}"
+ },
:url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o}},
:type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index bf96cd3f5..2369b25d0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -158,9 +158,9 @@
<% when 'Issue' %>
<% if e.user == User.current%>
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to(l(:label_activity_project)+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> |
+ <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> |
<% else %>
- <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to(l(:label_activity_project)+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> |
<% end %>
<%= textilizable act.description %> |
@@ -253,6 +253,6 @@
<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb
index 44447d47c..faea90fd3 100644
--- a/app/views/users/user_activities.html.erb
+++ b/app/views/users/user_activities.html.erb
@@ -1,21 +1,21 @@
-
+<%# end %> -->
<% unless @events_by_day.empty? %>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index d8e2ce70c..71acc78aa 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -17,6 +17,11 @@
$('#' + id).val(content);
}
}
+ // 给主页用户弹新页面
+ $(document).ready(function($) {
+ $("#loggedas").find("a").attr("target", "_blank");
+ //$("#content .tabs_new~ .pagination").find("a").removeAttr("target");
+ });
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index de6f3e119..0af3f5134 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -17,6 +17,11 @@
$('#' + id).val(content);
}
}
+ // 给主页用户弹新页面
+ $(document).ready(function($) {
+ $("#loggedas").find("a").attr("target", "_blank");
+ //$("#content .tabs_new~ .pagination").find("a").removeAttr("target");
+ });