Show only tm events related to this project

Dmitriy Zaporozhets
1 parent 366c0065
Showing 3 changed files with 13 additions and 11 deletions Show diff stats
app/assets/stylesheets/sections/projects.scss
app/controllers/team_members_controller.rb
app/views/team_members/show.html.haml
-.projects { 
+.projects {
   @extend .row;
   .activities {
   }
  
-  .side { 
+  .side {
     @extend .span4;
     @extend .right;
  
-    .projects_box { 
-      h5 { 
+    .projects_box {
+      h5 {
         color:$style_color;
         font-size:16px;
         text-shadow: 0 1px 1px #fff;
+        padding: 2px 10px;
       }
       @extend .leftbar;
       @extend .ui-box;
@@ -19,19 +20,19 @@
   }
 }
  
-.new_project, 
-.edit_project { 
-  .project_name_holder { 
+.new_project,
+.edit_project {
+  .project_name_holder {
     input,
-    label { 
+    label {
       font-size:16px;
       line-height:20px;
       padding:8px;
     }
-    label { 
+    label {
       color:#888;
     }
-    .btn { 
+    .btn {
       padding:6px;
       margin-left:10px;
     }
@@ -9,6 +9,7 @@ class TeamMembersController &lt; ApplicationController
  
   def show
     @team_member = project.users_projects.find(params[:id])
+    @events = @team_member.user.recent_events.where(:project_id => @project.id).limit(7)
   end
  
   def new
@@ -51,7 +51,7 @@
             = form_for(@team_member, as: :team_member, url: project_team_member_path(@project, @team_member)) do |f|
               = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, class: "project-access-select", disabled: !allow_admin
   %hr
-  = render user.recent_events.limit(5)
+  = render @events
 :javascript
   $(function(){
     $('.repo-access-select, .project-access-select').live("change", function() {
1		-.projects {
	1	+.projects {
2	2	@extend .row;
3	3	.activities {
4	4	}
5	5
6		- .side {
	6	+ .side {
7	7	@extend .span4;
8	8	@extend .right;
9	9
10		- .projects_box {
11		- h5 {
	10	+ .projects_box {
	11	+ h5 {
12	12	color:$style_color;
13	13	font-size:16px;
14	14	text-shadow: 0 1px 1px #fff;
	15	+ padding: 2px 10px;
15	16	}
16	17	@extend .leftbar;
17	18	@extend .ui-box;
...	...	@@ -19,19 +20,19 @@
19	20	}
20	21	}
21	22
22		-.new_project,
23		-.edit_project {
24		- .project_name_holder {
	23	+.new_project,
	24	+.edit_project {
	25	+ .project_name_holder {
25	26	input,
26		- label {
	27	+ label {
27	28	font-size:16px;
28	29	line-height:20px;
29	30	padding:8px;
30	31	}
31		- label {
	32	+ label {
32	33	color:#888;
33	34	}
34		- .btn {
	35	+ .btn {
35	36	padding:6px;
36	37	margin-left:10px;
37	38	}
...	...
...	...	@@ -9,6 +9,7 @@ class TeamMembersController < ApplicationController
9	9
10	10	def show
11	11	@team_member = project.users_projects.find(params[:id])
	12	+ @events = @team_member.user.recent_events.where(:project_id => @project.id).limit(7)
12	13	end
13	14
14	15	def new
...	...
...	...	@@ -51,7 +51,7 @@
51	51	= form_for(@team_member, as: :team_member, url: project_team_member_path(@project, @team_member)) do \|f\|
52	52	= f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, class: "project-access-select", disabled: !allow_admin
53	53	%hr
54		- = render user.recent_events.limit(5)
	54	+ = render @events
55	55	:javascript
56	56	$(function(){
57	57	$('.repo-access-select, .project-access-select').live("change", function() {
...	...