From ad5a6a4ae1fa784b2a6ecac8cc9791e23ec8f134 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Tue, 16 Oct 2012 12:45:30 +0200 Subject: [PATCH 1/2] Improve flash messages in tree#update --- app/controllers/tree_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/tree_controller.rb b/app/controllers/tree_controller.rb index 475e2b61..2781d791 100644 --- a/app/controllers/tree_controller.rb +++ b/app/controllers/tree_controller.rb @@ -34,9 +34,9 @@ class TreeController < ProjectResourceController ) if update_status - redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed" + redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited" else - flash[:notice] = "You can't save file because it has been changed" + flash[:notice] = "Your changes could not be commited, because the file has been changed" render :edit end end From 8e8d82d49ac80b230e89f034f7aac00ddd555d1e Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 15 Oct 2012 21:47:38 +0200 Subject: [PATCH 2/2] Only allow editing text files --- app/controllers/tree_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/tree_controller.rb b/app/controllers/tree_controller.rb index 2781d791..c9098cca 100644 --- a/app/controllers/tree_controller.rb +++ b/app/controllers/tree_controller.rb @@ -8,6 +8,7 @@ class TreeController < ProjectResourceController before_filter :require_non_empty_project before_filter :assign_ref_vars + before_filter :edit_requirements, only: [:edit, :update] def show @hex_path = Digest::SHA1.hexdigest(@path) @@ -40,4 +41,12 @@ class TreeController < ProjectResourceController render :edit end end + + private + + def edit_requirements + unless @tree.is_blob? && @tree.text? + redirect_to project_tree_path(@project, @id), notice: "You can only edit text files" + end + end end