#345: fixed groups/profile_controller
This commit is contained in:
parent
f9fc6fd33d
commit
c0d5c6ec88
|
@ -9,7 +9,7 @@ class Groups::ProfileController < Groups::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@path, page = group_path, params[:page].to_i
|
@path, page = group_path(@group), params[:page].to_i
|
||||||
@projects = @group.own_projects.opened.search(params[:search]).recent
|
@projects = @group.own_projects.opened.search(params[:search]).recent
|
||||||
if request.xhr?
|
if request.xhr?
|
||||||
if params[:visibility] != 'hidden'
|
if params[:visibility] != 'hidden'
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
- edit_url = can?(:edit, @group) ? edit_group_path(@group) : nil
|
- edit_url = can?(:edit, @group) ? edit_group_path(@group) : nil
|
||||||
= render 'shared/profile', uname: @group.name,
|
= render 'shared/profile', uname: @group.name,
|
||||||
group: @group,
|
group: @group,
|
||||||
search_path: group_path,
|
search_path: group_path(@group),
|
||||||
projects: @projects,
|
projects: @projects,
|
||||||
edit_url: edit_url
|
edit_url: edit_url
|
||||||
|
|
|
@ -260,7 +260,7 @@ Rosa::Application.routes.draw do
|
||||||
|
|
||||||
scope module: 'groups' do
|
scope module: 'groups' do
|
||||||
get '/groups/new' => 'profile#new' # need to force next route exclude id: 'new'
|
get '/groups/new' => 'profile#new' # need to force next route exclude id: 'new'
|
||||||
get '/groups/:id' => redirect("/%{id}"), as: :profile_group # override default group show route
|
get '/groups/:id' => redirect("/%{id}"), as: :profile_group # override default group show route
|
||||||
resources :groups, controller: 'profile' do
|
resources :groups, controller: 'profile' do
|
||||||
delete :remove_user, on: :member
|
delete :remove_user, on: :member
|
||||||
resources :members, only: [:index] do
|
resources :members, only: [:index] do
|
||||||
|
@ -405,7 +405,7 @@ Rosa::Application.routes.draw do
|
||||||
get '/' => 'users/profile#show', as: :user
|
get '/' => 'users/profile#show', as: :user
|
||||||
end
|
end
|
||||||
constraints Rosa::Constraints::Owner.new(Group, true) do
|
constraints Rosa::Constraints::Owner.new(Group, true) do
|
||||||
#get '/' => 'groups/profile#show', as: :group
|
get '/' => 'groups/profile#show'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue