Skip to content
Snippets Groups Projects
Commit 57f3409b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

move Wall to own resource

parent f3dfd229
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -68,22 +68,6 @@ class ProjectsController < ProjectResourceController
end
end
 
#
# Wall
#
def wall
return render_404 unless @project.wall_enabled
@target_type = :wall
@target_id = nil
@note = @project.notes.new
respond_to do |format|
format.html
end
end
def destroy
return access_denied! unless can?(current_user, :remove_project, project)
 
Loading
Loading
class WallsController < ProjectResourceController
before_filter :module_enabled
respond_to :js, :html
def show
@note = @project.notes.new
respond_to do |format|
format.html
end
end
protected
def module_enabled
return render_404 unless @project.wall_enabled
end
end
Loading
Loading
@@ -105,7 +105,7 @@ module ApplicationHelper
{ label: "#{simple_sanitize(@project.name_with_namespace)} - Snippets", url: project_snippets_path(@project) },
{ label: "#{simple_sanitize(@project.name_with_namespace)} - Team", url: project_team_index_path(@project) },
{ label: "#{simple_sanitize(@project.name_with_namespace)} - Tree", url: project_tree_path(@project, @ref || @project.repository.root_ref) },
{ label: "#{simple_sanitize(@project.name_with_namespace)} - Wall", url: wall_project_path(@project) },
{ label: "#{simple_sanitize(@project.name_with_namespace)} - Wall", url: project_wall_path(@project) },
{ label: "#{simple_sanitize(@project.name_with_namespace)} - Wiki", url: project_wikis_path(@project) },
]
end
Loading
Loading
Loading
Loading
@@ -41,7 +41,7 @@
 
- if @project.wall_enabled
= nav_link(path: 'projects#wall') do
= link_to 'Wall', wall_project_path(@project)
= link_to 'Wall', project_wall_path(@project)
 
- if @project.snippets_enabled
= nav_link(controller: :snippets) do
Loading
Loading
%div.wall_page
= render "notes/reversed_notes_with_form"
%div.wall-page
%ul.well-list.notes
.notes-busy.js-notes-busy
.js-main-target-form
= render "notes/form"
:javascript
$(function(){
Wall.init(#{@project.id});
});
Loading
Loading
@@ -167,11 +167,6 @@ Gitlab::Application.routes.draw do
# Project Area
#
resources :projects, constraints: { id: /(?:[a-zA-Z.0-9_\-]+\/)?[a-zA-Z.0-9_\-]+/ }, except: [:new, :create, :index], path: "/" do
member do
get "wall"
get "files"
end
resources :blob, only: [:show], constraints: {id: /.+/}
resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/}
resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
Loading
Loading
@@ -194,6 +189,12 @@ Gitlab::Application.routes.draw do
end
end
 
resource :wall, only: [:show] do
member do
get 'notes'
end
end
resource :repository do
member do
get "branches"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment