Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.

This commit is contained in:
konstantin.grabar 2012-03-05 13:11:50 +04:00
parent 0c194f5b50
commit c176304088
15 changed files with 192 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/activity_feeds_helper.rb
View File

@ -1,5 +1,5 @@
module ActivityFeedsHelper
def render_activity_feed(activity_feed)
render :partial => activity_feed.partial, :locals => activity_feed.data
render :partial => activity_feed.partial, :locals => activity_feed.data.merge(:activity_feed => activity_feed)
end
end

2
app/models/activity_feed_observer.rb
View File

@ -18,7 +18,7 @@ class ActivityFeedObserver < ActiveRecord::Observer
ActivityFeed.create(
:user => recipient,
:kind => 'new_issue_notification',
:data => {:user_name => recipient.name, :issue_serial_id => record.serial_id, :issue_title => record.title, :project_id => record.project.id, :project_name => record.project.name}
:data => {:user_name => record.user.name, :issue_serial_id => record.serial_id, :issue_title => record.title, :project_id => record.project.id, :project_name => record.project.name}
)
end

1
app/models/build_list.rb
View File

@ -62,6 +62,7 @@ class BuildList < ActiveRecord::Base
where(["status in (?) OR (status in (?) AND notified_at >= ?)", [WAITING_FOR_RESPONSE, BUILD_PENDING, BuildServer::BUILD_STARTED], outdatable_statuses, Time.now - 2.days])
}
scope :for_status, lambda {|status| where(:status => status) }
scope :for_user, lambda { |user| where(:user_id => user.id) }
scope :scoped_to_arch, lambda {|arch| where(:arch_id => arch) }
scope :scoped_to_project_version, lambda {|project_version| where(:project_version => project_version) }
scope :scoped_to_is_circle, lambda {|is_circle| where(:is_circle => is_circle) }

47
app/views/activity_feeds/_sidebar.html.haml Normal file
View File

@ -0,0 +1,47 @@
.bordered
= link_to t("layout.activity_feed.new_project"), new_project_path, :class => 'button'
%h3= t("layout.activity_feed.my_last_projects")
%table
%tbody
- current_user.projects.each do |project|
%tr
%td
- if project.public?
= image_tag("unlock.png")
- else
= image_tag("lock.png")
%td
= link_to "#{project.owner.uname}/#{project.name}", project_path(project)
%tr
%td
\ 
%td
= link_to t("layout.activity_feed.all_my_projects"), projects_path
.block
%h3= t("layout.activity_feed.my_builds_by_day")
%table{:cellpadding => "0", :cellspacing => "0"}
%tbody
%tr
%td.first
= link_to t("layout.build_lists.statuses.#{:build_published}"), build_lists_path(:filter => {:status => BuildList::BUILD_PUBLISHED})
%td= BuildList.for_status(BuildList::BUILD_PUBLISHED).for_user(current_user).count
%tr
%td.first
= link_to t("layout.build_lists.statuses.#{:success}"), build_lists_path(:filter => {:status => BuildServer::SUCCESS})
%td= BuildList.for_status(BuildServer::SUCCESS).for_user(current_user).count
%tr
%td.first
= link_to t("layout.build_lists.statuses.#{:build_started}"), build_lists_path(:filter => {:status => BuildServer::BUILD_STARTED})
%td= BuildList.for_status(BuildServer::BUILD_STARTED).for_user(current_user).count
%tr
%td.first
= link_to t("layout.build_lists.statuses.#{:build_pending}"), build_lists_path(:filter => {:status => BuildList::BUILD_PENDING})
%td= BuildList.for_status(BuildList::BUILD_PENDING).for_user(current_user).count
%tr
%td.first
= link_to t("layout.build_lists.statuses.#{:build_error}"), build_lists_path(:filter => {:status => BuildServer::BUILD_ERROR})
%td= BuildList.for_status(BuildServer::BUILD_ERROR).for_user(current_user).count
%tr
%td.first
= link_to t("layout.activity_feed.all_my_builds"), build_lists_path
%td  

23
app/views/activity_feeds/index.html.haml
View File

@ -1,21 +1,6 @@
%a{ :name => "comments" }
.block#block-list
.content
%h2.title
= t("layout.activity_feed.header")
.inner
%ul.list
%h3.fix= t("layout.activity_feed.header")
- @activity_feeds.each do |activity_feed|
%li
.left
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%br
= activity_feed.created_at
%br
%br
.item
.activity
= render_activity_feed(activity_feed)
%br
%br
%br
- content_for :sidebar, render('sidebar')

16
app/views/activity_feeds/partials/_git_delete_branch_notification.haml
View File

@ -1,3 +1,13 @@
%p== Branch #{ branch_name } has been deleted
%p== Into project #{ link_to(project_name, project_path(project_id)) }
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject Branch #{ branch_name } has been deleted
.both
.fulltext
Into project #{ link_to(project_name, project_path(project_id)) }

18
app/views/activity_feeds/partials/_git_new_push_notification.haml
View File

@ -1,6 +1,18 @@
%p== Branch #{ branch_name } has been #{ change_type }d
%p== Into project #{ link_to(project_name, project_path(project_id)) }
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject Branch #{ branch_name } has been #{ change_type }d
.both
.fulltext
Into project #{ link_to(project_name, project_path(project_id)) }
%br
%br
- last_commits.each do |commit|
= link_to commit[0], commit_path(project_id, commit[0])
= commit[1]

16
app/views/activity_feeds/partials/_issue_assign_notification.haml
View File

@ -1,3 +1,13 @@
%p== #{ t("notifications.bodies.issue_assign_notification.title", :user_name => user_name) }
%p= raw t("notifications.bodies.issue_assign_notification.content", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)))
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject #{ t("notifications.bodies.issue_assign_notification.title", :user_name => user_name) }
.both
.fulltext
= raw t("notifications.bodies.issue_assign_notification.content", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)))

21
app/views/activity_feeds/partials/_new_comment_notification.haml
View File

@ -1,5 +1,16 @@
%p== #{ t("notifications.bodies.new_comment_notification.title", :user_name => user_name) }
%p= raw t("notifications.bodies.new_comment_notification.content", {:issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id))})
%p "#{ comment_body }"
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject #{ t("notifications.bodies.new_comment_notification.title", :user_name => user_name) }
.both
.fulltext
= raw t("notifications.bodies.new_comment_notification.content", {:issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id))})
%br
%br
"#{ comment_body }"

21
app/views/activity_feeds/partials/_new_commit_comment_notification.haml
View File

@ -1,5 +1,16 @@
%p== #{ t("notifications.bodies.new_commit_comment_notification.title", :user_name => user_name) }
%p= raw t("notifications.bodies.new_comment_notification.commit_content", {:commit_link => link_to(commit_message, commit_path(project_id, commit_id))})
%p "#{ comment_body }"
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject #{ t("notifications.bodies.new_commit_comment_notification.title", :user_name => user_name) }
.both
.fulltext
= raw t("notifications.bodies.new_comment_notification.commit_content", {:commit_link => link_to(commit_message, commit_path(project_id, commit_id))})
%br
%br
"#{ comment_body }"

16
app/views/activity_feeds/partials/_new_issue_notification.haml
View File

@ -1,3 +1,13 @@
%p== #{ t("notifications.bodies.new_issue_notification.title", :user_name => user_name) }
%p= raw t("notifications.bodies.new_issue_notification.content", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)), :project_link => link_to(project_name, project_path(project_id)))
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject #{ t("notifications.bodies.new_issue_notification.title", :user_name => user_name) }
.both
.fulltext
= raw t("notifications.bodies.new_issue_notification.content", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)), :project_link => link_to(project_name, project_path(project_id)))

20
app/views/activity_feeds/partials/_new_user_notification.haml
View File

@ -1,5 +1,15 @@
%p== #{ t("notifications.bodies.new_user_notification.title", :user_name => user_name) }
%p #{ t("notifications.bodies.new_user_notification.content") }
%p #{ t("notifications.bodies.new_user_notification.email", :user_email => user_email) }
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject #{ t("notifications.bodies.new_user_notification.title", :user_name => user_name) }
.both
.fulltext
#{ t("notifications.bodies.new_user_notification.content") }
%br
#{ t("notifications.bodies.new_user_notification.email", :user_email => user_email) }

19
app/views/activity_feeds/partials/_wiki_new_commit_notification.haml
View File

@ -1,2 +1,17 @@
%p== User #{ link_to user_name, user_path(user_id) } has been update wiki #{ link_to "history", compare_versions_project_wiki_index_path(project_id, commit_sha) }
%p== Into project #{ link_to(project_name, project_path(project_id)) }
.top
.image
= image_tag(gravatar_url(activity_feed.user.email, 30))
.text
%span.name
= link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
%br
%span.date= activity_feed.created_at
%br
%span.subject
-#TODO: Fix wiki compare routes.
-# User #{ link_to user_name, user_path(user_id) } has been update wiki #{ link_to "history", compare_versions_project_wiki_index_path(project_id, commit_sha) }
.both
.fulltext
-#TODO: Fix wiki compare routes.
-#%p== User #{ link_to user_name, user_path(user_id) } has been update wiki #{ link_to "history", compare_versions_project_wiki_index_path(project_id, commit_sha) }
Into project #{ link_to(project_name, project_path(project_id)) }

5
config/locales/models/activity_feed.en.yml
View File

@ -2,6 +2,11 @@ en:
layout:
activity_feed:
header: Activity Feed
my_last_projects: My last projects
all_my_projects: All my projects
all_my_builds: All my builds
my_builds_by_day: My buils for last 24 hours
new_project: Create project
notifications:
subjects:

5
config/locales/models/activity_feed.ru.yml
View File

@ -2,6 +2,11 @@ ru:
layout:
activity_feed:
header: Лента активности
my_last_projects: Мои последние проекты
all_my_projects: Все мои проекты
all_my_builds: Все мои сборки
my_builds_by_day: Мои сборки за 24 часа
new_project: Создать проект
notifications:
subjects: