Commit 53421e06 authored by gitlabhq's avatar gitlabhq

clean controllers

parent 5f8255ac
...@@ -21,7 +21,6 @@ class CommitsController < ApplicationController ...@@ -21,7 +21,6 @@ class CommitsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.js format.js
format.json { render json: @commits }
end end
end end
...@@ -33,7 +32,6 @@ class CommitsController < ApplicationController ...@@ -33,7 +32,6 @@ class CommitsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # show.html.erb format.html # show.html.erb
format.js format.js
format.json { render json: @commit }
end end
end end
end end
...@@ -3,11 +3,6 @@ class KeysController < ApplicationController ...@@ -3,11 +3,6 @@ class KeysController < ApplicationController
def index def index
@keys = current_user.keys.all @keys = current_user.keys.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @keys }
end
end end
def new def new
...@@ -32,7 +27,6 @@ class KeysController < ApplicationController ...@@ -32,7 +27,6 @@ class KeysController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { redirect_to keys_url } format.html { redirect_to keys_url }
format.js { render :nothing => true } format.js { render :nothing => true }
format.json { head :ok }
end end
end end
end end
...@@ -8,10 +8,52 @@ class ProjectsController < ApplicationController ...@@ -8,10 +8,52 @@ class ProjectsController < ApplicationController
def index def index
@projects = current_user.projects.all @projects = current_user.projects.all
end
def new
@project = Project.new
end
def edit
end
def create
@project = Project.new(params[:project])
@project.owner = current_user
Project.transaction do
@project.save!
@project.users_projects.create!(:admin => true, :read => true, :write => true, :user => current_user)
end
respond_to do |format|
if @project.valid?
format.html { redirect_to @project, notice: 'Project was successfully created.' }
format.js
else
format.html { render action: "new" }
format.js
end
end
rescue Gitosis::AccessDenied
render :js => "location.href = '#{errors_gitosis_path}'" and return
rescue StandardError => ex
@project.errors.add(:base, "Cant save project. Please try again later")
respond_to do |format|
format.html { render action: "new" }
format.js
end
end
def update
respond_to do |format| respond_to do |format|
format.html # index.html.erb if project.update_attributes(params[:project])
format.json { render json: @projects } format.html { redirect_to project, notice: 'Project was successfully updated.' }
format.js
else
format.html { render action: "edit" }
format.js
end
end end
end end
...@@ -21,20 +63,27 @@ class ProjectsController < ApplicationController ...@@ -21,20 +63,27 @@ class ProjectsController < ApplicationController
@tree = @commit.tree @tree = @commit.tree
@tree = @tree / params[:path] if params[:path] @tree = @tree / params[:path] if params[:path]
respond_to do |format|
format.html # show.html.erb
format.json { render json: project }
end
rescue Grit::NoSuchPathError => ex rescue Grit::NoSuchPathError => ex
respond_to do |format| respond_to do |format|
format.html {render "projects/empty"} format.html {render "projects/empty"}
end end
end end
def tree #
load_refs # load @branch, @tag & @ref # Wall
#
def wall
@notes = @project.common_notes
@note = Note.new
end
#
# Repository preview
#
def tree
load_refs # load @branch, @tag & @ref
@repo = project.repo @repo = project.repo
...@@ -74,77 +123,14 @@ class ProjectsController < ApplicationController ...@@ -74,77 +123,14 @@ class ProjectsController < ApplicationController
return render_404 return render_404
end end
def new
@project = Project.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @project }
end
end
def edit
end
def create
@project = Project.new(params[:project])
@project.owner = current_user
Project.transaction do
@project.save!
@project.users_projects.create!(:admin => true, :read => true, :write => true, :user => current_user)
end
respond_to do |format|
if @project.valid?
format.html { redirect_to @project, notice: 'Project was successfully created.' }
format.js
format.json { render json: @project, status: :created, location: @project }
else
format.html { render action: "new" }
format.js
format.json { render json: @project.errors, status: :unprocessable_entity }
end
end
rescue Gitosis::AccessDenied
render :js => "location.href = '#{errors_gitosis_path}'" and return
rescue StandardError => ex
@project.errors.add(:base, "Cant save project. Please try again later")
respond_to do |format|
format.html { render action: "new" }
format.js
format.json { render json: @project.errors, status: :unprocessable_entity }
end
end
def update
respond_to do |format|
if project.update_attributes(params[:project])
format.html { redirect_to project, notice: 'Project was successfully updated.' }
format.js
format.json { head :ok }
else
format.html { render action: "edit" }
format.js
format.json { render json: project.errors, status: :unprocessable_entity }
end
end
end
def destroy def destroy
project.destroy project.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to projects_url } format.html { redirect_to projects_url }
format.json { head :ok }
end end
end end
def wall
@notes = @project.common_notes
@note = Note.new
end
protected protected
def project def project
......
...@@ -12,7 +12,6 @@ class TeamMembersController < ApplicationController ...@@ -12,7 +12,6 @@ class TeamMembersController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # show.html.erb format.html # show.html.erb
format.js format.js
format.json { render json: @team_member }
end end
end end
...@@ -22,7 +21,6 @@ class TeamMembersController < ApplicationController ...@@ -22,7 +21,6 @@ class TeamMembersController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # new.html.erb format.html # new.html.erb
format.js format.js
format.json { render json: @team_member }
end end
end end
...@@ -34,11 +32,9 @@ class TeamMembersController < ApplicationController ...@@ -34,11 +32,9 @@ class TeamMembersController < ApplicationController
if @team_member.save if @team_member.save
format.html { redirect_to @team_member, notice: 'Team member was successfully created.' } format.html { redirect_to @team_member, notice: 'Team member was successfully created.' }
format.js format.js
format.json { render json: @team_member, status: :created, location: @team_member }
else else
format.html { render action: "new" } format.html { render action: "new" }
format.js format.js
format.json { render json: @team_member.errors, status: :unprocessable_entity }
end end
end end
end end
...@@ -59,7 +55,6 @@ class TeamMembersController < ApplicationController ...@@ -59,7 +55,6 @@ class TeamMembersController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { redirect_to root_path } format.html { redirect_to root_path }
format.json { head :ok }
format.js { render :nothing => true } format.js { render :nothing => true }
end end
end end
......
%ul#notes-list %ul#notes-list
- @notes.each do |note| - @notes.each do |note|
- next unless note.author
= render :partial => "notes/show", :locals => {:note => note} = render :partial => "notes/show", :locals => {:note => note}
%br %br
......
-#- if current_user.can_create_project?
= link_to 'New Project', new_project_path, :class => "lbutton vm"
%table.round-borders#projects-list %table.round-borders#projects-list
%tr %tr
%th Name %th Name
......
%div.top_project_menu %div.top_project_menu
%span= link_to 'All', projects_path, :class => current_page?(projects_path) ? "current" : nil %span= link_to 'All', projects_path, :class => current_page?(projects_path) ? "current" : nil
%span= link_to "New Project", new_project_path, :class => current_page?(:controller => "projects", :action => "new") ? "current" : nil - if current_user.can_create_project?
%span= link_to "New Project", new_project_path, :class => current_page?(:controller => "projects", :action => "new") ? "current" : nil
%span.right %span.right
= link_to_function(image_tag("list_view_icon.jpg"), "switchProjectView()", :style => "border:none;box-shadow:none;") = link_to_function(image_tag("list_view_icon.jpg"), "switchProjectView()", :style => "border:none;box-shadow:none;")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment