#34: update messages, comments

This commit is contained in:
Vokhmin Alexey V 2013-04-15 13:40:41 +04:00
parent 4414479650
commit 03396ea606
4 changed files with 19 additions and 15 deletions

View File

@ -3,11 +3,11 @@ class Projects::HooksController < Projects::BaseController
before_filter :authenticate_user!
load_resource :project
# GET /../hooks
# GET /../hooks.json
# GET /uname/project/hooks
# GET /uname/project/hooks?name=web
def index
@name = params[:name]
@hooks = @project.hooks.for_name(@name).order('name asc, created_at asc')
@hooks = @project.hooks.for_name(@name).order('name asc, created_at desc')
if @name.present?
render :show
else
@ -15,23 +15,21 @@ class Projects::HooksController < Projects::BaseController
end
end
# GET /../hooks/new
# GET /../hooks/new.json
# GET /uname/project/hooks/new
def new
@hook = @project.hooks.new(params[:hook])
end
# GET /../hooks/1/edit
# GET /uname/project/hooks/1/edit
def edit
@hook = @project.hooks.find params[:id]
end
# POST /../hooks
# POST /../hooks.json
# POST /uname/project/hooks
def create
@hook = @project.hooks.new params[:hook]
if @hook.save
redirect_to project_hooks_path(@project, :name => @hook.name), :notice => 'Hook was successfully created.'
redirect_to project_hooks_path(@project, :name => @hook.name), :notice => t('flash.hook.created')
else
flash[:error] = t('flash.hook.save_error')
flash[:warning] = @hook.errors.full_messages.join('. ')
@ -39,12 +37,11 @@ class Projects::HooksController < Projects::BaseController
end
end
# PUT /../hooks/1
# PUT /../hooks/1.json
# PUT /uname/project/hooks/1
def update
@hook = @project.hooks.find params[:id]
if @hook.update_attributes(params[:hook])
redirect_to project_hooks_path(@project, :name => @hook.name), :notice => 'Hook was successfully updated.'
redirect_to project_hooks_path(@project, :name => @hook.name), :notice => t('flash.hook.updated')
else
flash[:error] = t('flash.hook.save_error')
flash[:warning] = @hook.errors.full_messages.join('. ')
@ -52,8 +49,7 @@ class Projects::HooksController < Projects::BaseController
end
end
# DELETE /../hooks/1
# DELETE /../hooks/1.json
# DELETE /uname/project/hooks/1
def destroy
@hook = @project.hooks.find params[:id]
@hook.destroy

View File

@ -6,6 +6,10 @@ en:
hipchat: HipChat
flash:
hook:
save_error: Unable to save hook
created: Hook was successfully created
updated: Hook was successfully updated
activerecord:
attributes:

View File

@ -6,6 +6,10 @@ ru:
hipchat: HipChat
flash:
hook:
save_error: Не удалось сохранить хук
created: Хук успешно сохранен
updated: Хук успешно обновлен
activerecord:
attributes:

View File

@ -39,7 +39,7 @@ ru:
members: Участники
groups: Группы
edit_collaborators: Участники
hooks: Служебные методы
hooks: Веб хуки
role: Роль в проекте
remove_user: Покинуть проект
issues: Задачи