Commit c03e148d87aa284e9524abe572bbacc771fa8049
- Date: Mon Apr 28 15:18:45 +0000 2008
- Committer: mtkd (mtkd@prj2.com)
- Author: mtkd (mtkd@prj2.com)
- Commit SHA1: c03e148d87aa284e9524abe572bbacc771fa8049
- Tree SHA1: b512d347a6ed14b1b6c9e23f03fdf293d3738d53
Fixed members and tickets tabs
Commit diff
| |   |
| 1 | class 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 | |
| 27 | end |
| toggle raw diff |
--- /dev/null
+++ b/app/controllers/members_controller.rb
@@ -0,0 +1,27 @@
+class MembersController < ApplicationController
+
+ def index
+ if params[:project_id] != nil
+ # Project members index page, shows list of all members (and activity) for that project
+ @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
+ if @project != nil
+ @members = Member.find_by_project(@project.id)
+ if @members.size > 0
+ @title = "Member Activity"
+ @url_suffix = ""
+ render :action => "ac_project_index"
+ else
+ flash[:error] = "No members for this project."
+ redirect_to project_path(@project.slug)
+ end
+ else
+ flash[:error] = "Project not found."
+ redirect_to root_path
+ end
+ else
+ flash[:error] = "No project specified."
+ redirect_to root_path
+ end
+ end
+
+end |
| |   |
| 1 | 1 | module MembersHelper |
| 2 | 2 | |
| 3 | include ProjectsHelper #if $application_mode == MODE_GITLAB |
| 4 | |
| 3 | 5 | # |
| 4 | 6 | # FIXME pointless, and should be in model |
| 5 | 7 | def format_member_accesslevel(accesslevel) |
| toggle raw diff |
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -1,5 +1,7 @@
module MembersHelper
+ include ProjectsHelper #if $application_mode == MODE_GITLAB
+
#
# FIXME pointless, and should be in model
def format_member_accesslevel(accesslevel) |
| |   |
| 3 | 3 | # Gitlab |
| 4 | 4 | include ProjectsHelper if $application_mode == MODE_GITLAB |
| 5 | 5 | |
| 6 | | |
| 6 | def render_project_tickets |
| 7 | end |
| 7 | 8 | |
| 8 | 9 | |
| 9 | 10 | end |
| toggle raw diff |
--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -3,7 +3,8 @@ module TicketsHelper
# Gitlab
include ProjectsHelper if $application_mode == MODE_GITLAB
-
+ def render_project_tickets
+ end
end |
| |   |
| 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 |
--- /dev/null
+++ b/app/views/members/ac_project_index.html.erb
@@ -0,0 +1,11 @@
+<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_MEMBERS,
+ :subtab => PRJ_TAB_SUBTAB_NONE,
+ :project => @project,
+ :pagetitle => @title } %>
+
+<%= div_formattedtext_open %>
+
+
+<%= div_formattedtext_close %>
+
+<%= render :partial => "projects/ac_project_footer" %> |