X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e74163d036a0520de62667b2e77ffbe66bc7c72d..cf639202b802be9ce1a6f3f65e7d4f6292a2ad3a:/app/controllers/issues_controller.rb diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index dc357a6ae..550140232 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -52,7 +52,7 @@ class IssuesController < ApplicationController unless create_new_issue_params.blank? @issue = Issue.find_or_initialize_by(create_new_issue_params) path = 'issues.report_strings.' + @issue.reportable.class.name.to_s - @report_strings_yaml = t( path) + @report_strings_yaml = t(path) end end @@ -139,16 +139,21 @@ class IssuesController < ApplicationController def comment @issue = Issue.find(params[:id]) - @issue_comment = @issue.comments.build(issue_comment_params) - @issue_comment.commenter_user_id = @user.id - if params[:reassign] - reassign_issue - @issue_comment.reassign = true - end - @issue_comment.save! - @issue.updated_by = @user.id - @issue.save! - redirect_to @issue + if issue_comment_params.blank? + notice = t('issues.comment.provide_details') + else + @issue_comment = @issue.comments.build(issue_comment_params) + @issue_comment.commenter_user_id = @user.id + if params[:reassign] + reassign_issue + @issue_comment.reassign = true + end + @issue_comment.save! + @issue.updated_by = @user.id + @issue.save! + notice = t('issues.comment.comment_created') + end + redirect_to @issue, notice: notice end # Status Transistions @@ -219,7 +224,7 @@ class IssuesController < ApplicationController end def check_permission - unless @user.administrator? + unless @user.administrator? or @user.moderator? flash[:error] = t('application.require_admin.not_an_admin') redirect_to root_path end