layout "site"
before_action :authorize_web
+ before_action :set_locale
before_action :require_user
- before_action :set_issues
- before_action :check_permission, :only => [:index, :show, :resolve, :open, :ignore, :comment]
+ before_action :check_permission
before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
def index
- if current_user.moderator?
- @issue_types = @moderator_issues
- @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
- else
- @issue_types = @admin_issues
- @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
- end
+ @title = t ".title"
+
+ @issue_types = []
+ @issue_types.concat %w[Note] if current_user.moderator?
+ @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator?
- @issues = Issue.where(:assigned_role => current_user.roles.map(&:role))
+ @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
+ @issues = Issue.visible_to(current_user)
# If search
- if params[:search_by_user] && params[:search_by_user].present?
+ if params[:search_by_user]&.present?
@find_user = User.find_by(:display_name => params[:search_by_user])
if @find_user
@issues = @issues.where(:reported_user_id => @find_user.id)
else
- notice = t("issues.index.search.user_not_found")
+ @issues = @issues.none
+ flash.now[:warning] = t(".user_not_found")
end
end
- if params[:status] && params[:status][0].present?
- @issues = @issues.where(:status => params[:status][0].to_i)
- end
+ @issues = @issues.where(:status => params[:status]) if params[:status]&.present?
- if params[:issue_type] && params[:issue_type][0].present?
- @issues = @issues.where(:reportable_type => params[:issue_type][0])
- end
+ @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.present?
- # If last_updated_by
- if params[:last_updated_by] && params[:last_updated_by][0].present?
- last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i
+ if params[:last_updated_by]&.present?
+ last_updated_by = params[:last_updated_by].to_s == "nil" ? nil : params[:last_updated_by].to_i
@issues = @issues.where(:updated_by => last_updated_by)
end
-
- if params[:last_reported_by] && params[:last_reported_by][0].present?
- last_reported_by = params[:last_reported_by][0].to_s == "nil" ? nil : params[:last_reported_by][0].to_i
- @issues = @issues.where(:updated_by => last_reported_by)
- end
-
- redirect_to issues_path, :notice => notice if notice
end
def show
@read_reports = @issue.read_reports
@unread_reports = @issue.unread_reports
@comments = @issue.comments
- @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role))
+ @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) if @issue.reported_user
@new_comment = IssueComment.new(:issue => @issue)
end
- def update
- @issue = Issue.find_by(issue_params)
- # Check if details provided are sufficient
- if check_report_params
- @report = @issue.reports.where(:reporter_user_id => current_user.id).first
-
- if @report.nil?
- @report = @issue.reports.build(report_params)
- @report.reporter_user_id = current_user.id
- notice = t("issues.update.new_report")
- end
-
- details = report_details
- @report.details = details
-
- # Checking if instance has been updated since last report
- @last_report = @issue.reports.order(:updated_at => :desc).last
- if check_if_updated
- @issue.reopen
- @issue.save!
- end
-
- notice = t("issues.update.successful_update") if notice.nil?
-
- if @report.save!
- @issue.report_count = @issue.reports.count
- @issue.save!
- redirect_back :fallback_location => "/", :notice => notice
- end
- else
- redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.update.provide_details")
- end
- end
-
# Status Transistions
def resolve
if @issue.resolve
@issue.save!
- redirect_to @issue, :notice => t("issues.resolved")
+ redirect_to @issue, :notice => t(".resolved")
else
render :show
end
if @issue.ignore
@issue.updated_by = current_user.id
@issue.save!
- redirect_to @issue, :notice => t("issues.ignored")
+ redirect_to @issue, :notice => t(".ignored")
else
render :show
end
if @issue.reopen
@issue.updated_by = current_user.id
@issue.save!
- redirect_to @issue, :notice => t("issues.reopened")
+ redirect_to @issue, :notice => t(".reopened")
else
render :show
end
private
- def set_issues
- @admin_issues = %w[DiaryEntry DiaryComment User]
- @moderator_issues = %w[Changeset Note]
- end
-
- def check_if_updated
- if @issue.reportable && (@issue.ignored? || @issue.resolved?) && @issue.reportable.has_attribute?(:updated_by) && @issue.reportable.updated_at > @last_report.updated_at
- true
- else
- false
- end
- end
-
- def report_details
- params[:report][:details] + "--||--" + params[:report_type].to_s + "--||--"
- end
-
- def check_report_params
- params[:report] && params[:report][:details] && params[:report_type]
- end
-
def find_issue
@issue = Issue.find(params[:id])
end
def check_permission
unless current_user.administrator? || current_user.moderator?
- flash[:error] = t("application.require_admin.not_an_admin")
+ flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")
redirect_to root_path
end
end
-
- def issue_params
- params[:issue].permit(:reportable_id, :reportable_type)
- end
-
- def report_params
- params[:report].permit(:details)
- end
-
- def issue_comment_params
- params.require(:issue_comment).permit(:body)
- end
-
- def sort_column
- Issue.column_names.include?(params[:sort]) ? params[:sort] : "status"
- end
-
- def sort_direction
- %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
- end
end
projects / rails.git / blobdiff