diff options
author | Marius Mathiesen <marius@shortcut.no> | 2009-12-07 14:14:45 +0100 |
---|---|---|
committer | Marius Mathiesen <marius@shortcut.no> | 2009-12-07 14:18:15 +0100 |
commit | e17f11563aeb7612b78583e8e4ed8f28cd1d2167 (patch) | |
tree | 14317f34ee069a9ffdef9b779a5d1c75a9dbcc3e /app | |
parent | 2bd6ef4a7f02db37021263e4c9a257b20948c57f (diff) | |
download | gitorious-mainline-outdated-e17f11563aeb7612b78583e8e4ed8f28cd1d2167.zip gitorious-mainline-outdated-e17f11563aeb7612b78583e8e4ed8f28cd1d2167.tar.gz gitorious-mainline-outdated-e17f11563aeb7612b78583e8e4ed8f28cd1d2167.tar.bz2 |
Projects can be favorited too (no link in the GUI yet, but still)
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/favorites_helper.rb | 2 | ||||
-rw-r--r-- | app/models/favorite.rb | 7 | ||||
-rw-r--r-- | app/models/project.rb | 1 | ||||
-rw-r--r-- | app/views/users/show.html.erb | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/app/helpers/favorites_helper.rb b/app/helpers/favorites_helper.rb index 9d78fa8..6206280 100644 --- a/app/helpers/favorites_helper.rb +++ b/app/helpers/favorites_helper.rb @@ -55,7 +55,7 @@ module FavoritesHelper watchable.target_repository, watchable])) else - link_to(favorite.inspect, "/") + link_to(h(watchable.title), watchable) end end diff --git a/app/models/favorite.rb b/app/models/favorite.rb index 58c3bc0..37e9510 100644 --- a/app/models/favorite.rb +++ b/app/models/favorite.rb @@ -34,10 +34,13 @@ class Favorite < ActiveRecord::Base end def project - if MergeRequest === watchable + case watchable + when MergeRequest watchable.target_repository.project - else + when Repository watchable.project + when Project + watchable end end diff --git a/app/models/project.rb b/app/models/project.rb index 3c372a1..6f6c0fc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -27,6 +27,7 @@ class Project < ActiveRecord::Base acts_as_taggable include RecordThrottling include UrlLinting + include Watchable belongs_to :user belongs_to :owner, :polymorphic => true diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d48b0b1..7d874a5 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -89,8 +89,8 @@ <% if is_current_user?(@user) %> <ul class="tab-bar"> <% [["Your activities", params[:events].blank?, {}], - ["Watched activities", params[:events] == "watched", {:events => "watched"}]] - .each do |label, on_display, event_params| -%> + ["Watched activities", params[:events] == "watched", {:events => "watched"}] + ].each do |label, on_display, event_params| -%> <li class="<%= on_display ? 'on' : 'off' -%>"> <%= link_to(label, user_path(@user, event_params)) -%> </li> |