Commit c03e148d87aa284e9524abe572bbacc771fa8049

Fixed members and tickets tabs

Commit diff

app/controllers/members_controller.rb

 
1class MembersController < ApplicationController
2
3 def index
4 if params[:project_id] != nil
5 # Project members index page, shows list of all members (and activity) for that project
6 @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
7 if @project != nil
8 @members = Member.find_by_project(@project.id)
9 if @members.size > 0
10 @title = "Member Activity"
11 @url_suffix = ""
12 render :action => "ac_project_index"
13 else
14 flash[:error] = "No members for this project."
15 redirect_to project_path(@project.slug)
16 end
17 else
18 flash[:error] = "Project not found."
19 redirect_to root_path
20 end
21 else
22 flash[:error] = "No project specified."
23 redirect_to root_path
24 end
25 end
26
27end
toggle raw diff

app/helpers/members_helper.rb

 
11module MembersHelper
22
3 include ProjectsHelper #if $application_mode == MODE_GITLAB
4
35 #
46 # FIXME pointless, and should be in model
57 def format_member_accesslevel(accesslevel)
toggle raw diff

app/helpers/tickets_helper.rb

 
33 # Gitlab
44 include ProjectsHelper if $application_mode == MODE_GITLAB
55
6
6 def render_project_tickets
7 end
78
89
910end
toggle raw diff

app/views/members/ac_project_index.html.erb

 
1<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_MEMBERS,
2 :subtab => PRJ_TAB_SUBTAB_NONE,
3 :project => @project,
4 :pagetitle => @title } %>
5
6<%= div_formattedtext_open %>
7
8
9<%= div_formattedtext_close %>
10
11<%= render :partial => "projects/ac_project_footer" %>
toggle raw diff