Show only tm events related to this project
This commit is contained in:
parent
366c0065c4
commit
2e7ca8c866
|
@ -1,17 +1,18 @@
|
|||
.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 < 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() {
|
||||
|
|
Loading…
Reference in a new issue