From: Shrey Date: Sat, 13 Jun 2015 18:27:36 +0000 (+0530) Subject: Added Issue Type + Issue Reassigning + Last updated_by X-Git-Tag: live~2953^2~145 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f72c34aaf85b736a2d4b880886ca84f490b28ba0 Added Issue Type + Issue Reassigning + Last updated_by --- diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 7cd21d512..24ac932d6 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -7,21 +7,34 @@ class IssuesController < ApplicationController before_action :find_issue, only: [:show, :resolve, :reopen, :ignore] def index - if params[:search_by_user].present? - @user = User.find_by_display_name(params[:search_by_user]) - if @user.present? - @issues = Issue.where(reported_user_id: @user.id).order(:status) + # Get user role + if @user.administrator? + @user_role = "administrator" + else + @user_role = "moderator" + end + + # If search + if params[:search_by_user] + @find_user = User.find_by_display_name(params[:search_by_user]) + if @find_user + @issues = Issue.where(reported_user_id: @find_user.id, issue_type: @user_role).order(:status) else - @issues = Issue.all.order(:status) - redirect_to issues_path, notice: t('issues.index.search.user_not_found') + @issues = Issue.where(issue_type: @user_role).order(:status) + notice = t('issues.index.search.user_not_found') end - - if @user.present? and not @issues.present? - @issues = Issue.all.order(:status) - redirect_to issues_path, notice: t('issues.index.search.issues_not_found') + + if @find_user !=nil and @issues.first == nil + @issues = Issue.where(issue_type: @user_role).order(:status) + notice = t('issues.index.search.issues_not_found') end + + if notice + redirect_to issues_path, notice: notice + end + else - @issues = Issue.all.order(:status) + @issues = Issue.where(issue_type: @user_role).order(:status) end end @@ -30,6 +43,9 @@ class IssuesController < ApplicationController @unread_reports = @issue.unread_reports @comments = @issue.comments @related_issues = @issue.user.issues + if @issue.updated_by + @updated_by_admin = User.find(@issue.updated_by) + end end def new @@ -41,14 +57,23 @@ class IssuesController < ApplicationController end def create + admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User'] + moderator_issues = [] @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type]) # Check if Issue alrwady exists if !@issue @issue = Issue.find_or_initialize_by(issue_params) + @issue.updated_by = nil @admins = UserRole.where(role: "administrator") @admins.each do |admin| Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now end + + # Reassign to moderators if it is a moderator issue + @issue.issue_type = "administrator" + if moderator_issues.include? @issue.reportable.class.name + reassign_issue + end end # Check if details provided are sufficient @@ -112,7 +137,13 @@ class IssuesController < ApplicationController @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 end @@ -128,6 +159,7 @@ class IssuesController < ApplicationController def ignore if @issue.ignore + @issue.updated_by = @user.id @issue.save! redirect_to @issue, notice: t('issues.ignored') else @@ -137,6 +169,7 @@ class IssuesController < ApplicationController def reopen if @issue.reopen + @issue.updated_by = @user.id @issue.save! redirect_to @issue, notice: t('issues.reopened') else @@ -144,6 +177,15 @@ class IssuesController < ApplicationController end end + # Reassign Issues between Administrators and Moderators + def reassign_issue + if @issue.issue_type == "moderator" + @issue.issue_type = "administrator" + else + @issue.issue_type = "moderator" + end + @issue.save! + end private diff --git a/app/models/issue.rb b/app/models/issue.rb index 604b73d98..6de535e81 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -10,6 +10,7 @@ class Issue < ActiveRecord::Base # Check if more statuses are needed enum status: %w( open ignored resolved ) + enum type: %w( administrator moderator ) scope :with_status, -> (issue_status) { where(:status => statuses[issue_status])} @@ -44,5 +45,4 @@ class Issue < ActiveRecord::Base end end - end diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index 76a6666f3..5a34bad5e 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -31,11 +31,12 @@ <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %> <% end %> + <% if @user and diary_entry.user.id != @user.id %>
  • - <% if @user and diary_entry.user.id != @user.id %> <%= link_to t('issues.report'), new_issue_url(reportable_id: diary_entry.id, reportable_type: diary_entry.class.name, reported_user_id: diary_entry.user.id) %> - <% end %>
    • + <% end %> + <%= if_administrator(:li) do %> <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %> <% end %> diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb index de4989afd..2e259a169 100644 --- a/app/views/issues/_comments.html.erb +++ b/app/views/issues/_comments.html.erb @@ -6,6 +6,11 @@ <%= link_to comment.user.display_name, :controller => :user,:action =>:view, :display_name => comment.user.display_name %>
    <%= comment.body %> + + <% if comment.reassign %> +
    + <%= t('issues.show.comments.reassign') %> + <% end %> On <%= l comment.created_at.to_datetime, :format => :long %> @@ -16,6 +21,9 @@
    <%= form_for :issue_comment, :url => { :action => 'comment', :id => @issue.id, :user_id => @user.id } do |f| %> <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8 %> + <%= label_tag t('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %> +
    +
    <%= submit_tag 'Submit' %> <% end %>
    \ No newline at end of file diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 101df96ba..4002e9db3 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,7 +1,7 @@

    <%= notice %>

    <% content_for :heading do %> -

    List of existing Issues:

    +

    List of <%= @user_role %> issues:

    <% end %> <%= form_tag(issues_path, :method => :get) do %> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 1f57c454e..4de7a77c6 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -4,7 +4,7 @@

    Issue type: <%= @issue.reportable_type %>

    - <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %> <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved_at? %> + <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %> <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved_at? %> <%= "| Last updated at #{l(@issue.updated_at.to_datetime, :format => :long)} by #{@updated_by_admin.display_name}" if @updated_by_admin %>

    <%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>

    diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 5962eb747..e62069a5e 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -953,6 +953,10 @@ en-GB: provide_details: Please provide the required details new: details: Please provide some more details into the problem. (This field cannot be left blank!) + show: + comments: + reassign: The Issue was reassigned + reassign_param: Reassign Issue? resolved: Issue status has been set to 'Resolved' ignored: Issue status has been set to 'Ignored' reopened: Issue status has been set to 'Open' diff --git a/config/locales/en.yml b/config/locales/en.yml index 46de256bf..c65f51bc6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -923,6 +923,10 @@ en: provide_details: Please provide the required details new: details: Please provide some more details into the problem. (This field cannot be left blank!) + show: + comments: + reassign: The Issue was reassigned + reassign_param: Reassign Issue? resolved: Issue status has been set to 'Resolved' ignored: Issue status has been set to 'Ignored' reopened: Issue status has been set to 'Open' diff --git a/db/migrate/20150516073616_create_issues_and_reports.rb b/db/migrate/20150516073616_create_issues_and_reports.rb index 153dbd690..709754dbf 100644 --- a/db/migrate/20150516073616_create_issues_and_reports.rb +++ b/db/migrate/20150516073616_create_issues_and_reports.rb @@ -7,10 +7,12 @@ class CreateIssuesAndReports < ActiveRecord::Migration t.integer :reportable_id, :null => false t.integer :reported_user_id, :null => false t.integer :status + t.string :issue_type t.datetime :resolved_at t.integer :resolved_by t.datetime :created_at t.datetime :updated_at + t.integer :updated_by t.timestamps null: false end diff --git a/db/migrate/20150526130032_create_issue_comments.rb b/db/migrate/20150526130032_create_issue_comments.rb index 688fa2b99..9fb35a922 100644 --- a/db/migrate/20150526130032_create_issue_comments.rb +++ b/db/migrate/20150526130032_create_issue_comments.rb @@ -5,7 +5,7 @@ class CreateIssueComments < ActiveRecord::Migration t.integer :commenter_user_id t.text :body t.datetime :created_at - + t.boolean :reassign t.timestamps null: false end diff --git a/db/structure.sql b/db/structure.sql index e19788329..4c1328a18 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -151,10 +151,6 @@ CREATE FUNCTION xid_to_int4(xid) RETURNS integer AS '$libdir/libpgosm', 'xid_to_int4'; -SET default_tablespace = ''; - -SET default_with_oids = false; - SET default_tablespace = ''; SET default_with_oids = false; @@ -677,6 +673,7 @@ CREATE TABLE issue_comments ( commenter_user_id integer, body text, created_at timestamp without time zone NOT NULL, + reassign boolean, updated_at timestamp without time zone NOT NULL ); @@ -710,10 +707,12 @@ CREATE TABLE issues ( reportable_id integer NOT NULL, reported_user_id integer NOT NULL, status integer, + issue_type character varying, resolved_at timestamp without time zone, resolved_by integer, created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + updated_at timestamp without time zone NOT NULL, + updated_by integer );