From: Shrey Date: Mon, 1 Jun 2015 15:58:14 +0000 (+0530) Subject: DB changes + Related issues added X-Git-Tag: live~2949^2~152 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d1d4f8192da5a266cddb17bb8970b2b04387888c DB changes + Related issues added --- diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 24538ebfe..b658e4e32 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -2744,3 +2744,21 @@ input.richtext_title[type="text"] { background: #eee; opacity: 0.7; } + +.report-related-block { + display:inline-block; +} + +.report-block { + width:475px; + float:left; + margin-right:100px; +} + +.related-block{ + float:right; +} + +.issue-comments { + width:475px; +} \ No newline at end of file diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 752bcd236..c1c5dd4f3 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -14,12 +14,12 @@ class IssuesController < ApplicationController @read_reports = @issue.read_reports @unread_reports = @issue.unread_reports @comments = @issue.comments + @related_issues = @issue.user.issues end def new unless create_new_issue_params.blank? @issue = Issue.find_or_initialize_by(create_new_issue_params) - puts params[:user_id].to_s + "--------------" end end @@ -35,7 +35,7 @@ class IssuesController < ApplicationController @report = @issue.reports.build(report_params) @report.user_id = @user.id if @issue.save! - redirect_to root_path, notice: 'Issue was successfully created.' + redirect_to root_path, notice: 'Your report has been registered sucessfully.' else render :new end @@ -91,11 +91,11 @@ class IssuesController < ApplicationController end def create_new_issue_params - params.permit(:reportable_id, :reportable_type, :user_id) + params.permit(:reportable_id, :reportable_type, :reported_user_id) end def issue_params - params[:issue].permit(:reportable_id, :reportable_type,:user_id) + params[:issue].permit(:reportable_id, :reportable_type,:reported_user_id) end def report_params diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 109599be4..b063935ea 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -9,7 +9,7 @@ module IssuesHelper :display_name => reportable.user.display_name, :id => reportable.id when "User" - link_to reportable.display_name, :controller => reportable.class.name.underscore, + link_to reportable.display_name.to_s, :controller => reportable.class.name.underscore, :action => "view", :display_name => reportable.display_name when "DiaryComment" diff --git a/app/models/issue.rb b/app/models/issue.rb index 7a481fe6c..a9e2d2405 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1,10 +1,12 @@ class Issue < ActiveRecord::Base belongs_to :reportable, :polymorphic => true + belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id + has_many :reports has_many :comments, :class_name => "IssueComment" + validates :reportable_id, :uniqueness => { :scope => [ :reportable_type ] } - belongs_to :user - validates :user_id, :presence => true + validates :reported_user_id, :presence => true # Check if more statuses are needed enum status: %w( open ignored resolved ) diff --git a/app/models/user.rb b/app/models/user.rb index 3d262fd25..866074766 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,7 +26,7 @@ class User < ActiveRecord::Base has_many :roles, :class_name => "UserRole" - has_many :issues + has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id has_many :issue_comments has_many :reports diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb index 46aab6103..f53e30f45 100644 --- a/app/views/diary_entry/_diary_comment.html.erb +++ b/app/views/diary_entry/_diary_comment.html.erb @@ -5,5 +5,5 @@ <%= if_administrator(:span) do %> <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %> | <% end %> - <%= link_to 'Report', new_issue_url(reportable_id: diary_comment.id, reportable_type: diary_comment.class.name, user_id: diary_comment.user.id) %> + <%= link_to 'Report', new_issue_url(reportable_id: diary_comment.id, reportable_type: diary_comment.class.name, reported_user_id: diary_comment.user.id) %> diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index 8278e80b0..5b608c2d7 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -31,7 +31,7 @@ <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %> <% end %> -
  • <%= link_to 'Report', new_issue_url(reportable_id: diary_entry.id, reportable_type: diary_entry.class.name, user_id: diary_entry.user.id) %>
    • +
  • <%= link_to 'Report', new_issue_url(reportable_id: diary_entry.id, reportable_type: diary_entry.class.name, reported_user_id: diary_entry.user.id) %>
    • <%= 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') } %> diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb index 3e236fb8e..de4989afd 100644 --- a/app/views/issues/_comments.html.erb +++ b/app/views/issues/_comments.html.erb @@ -1,3 +1,4 @@ +
    <% comments.each do |comment| %>
    @@ -10,9 +11,11 @@ On <%= l comment.created_at.to_datetime, :format => :long %>
    <% end %> +
    +
    <%= form_for :issue_comment, :url => { :action => 'comment', :id => @issue.id, :user_id => @user.id } do |f| %> - <%= richtext_area :issue_comment, :body, :cols => 80, :rows => 8 %> + <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8 %> <%= submit_tag 'Submit' %> <% end %>
    \ No newline at end of file diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 2b26765b6..476e06be2 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -8,7 +8,7 @@
    <%= f.hidden_field :reportable_id %> <%= f.hidden_field :reportable_type %> - <%= f.hidden_field :user_id %> + <%= f.hidden_field :reported_user_id %>
    diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index abbe0fa98..84c52d077 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -4,30 +4,54 @@

    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? %> + <%= @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? %>

    <%= link_to "Resolve", resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>

    <%= link_to "Ignore", ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %>

    <%= link_to "Reopen", reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %>

    <% end %> -

    Reports under this issue:

    -<% if @read_reports.present? %> -
    -

    Read Reports:

    - <%= render 'reports',reports: @read_reports %> +
    + +
    +

    Reports under this issue:

    + + <% if @read_reports.present? %> +
    +

    Read Reports:

    + <%= render 'reports',reports: @read_reports %> +
    + <% end %> + + <% if @unread_reports.any? %> +
    +

    New Reports:

    + <%= render 'reports',reports: @unread_reports %> +
    + <% end %> +
    -<% end %> -<% if @unread_reports.any? %> -
    -

    New Reports:

    - <%= render 'reports',reports: @unread_reports %> +
    +

    Other issues against this user:

    +
    + <% if @related_issues.count > 1 %> + <% @related_issues.each do |issue| %> + <% if issue.id != @issue.id %> + <%= link_to "#{issue.reportable_type} ##{issue.reportable_id}", issue %> + <% end %> + <% end %> + <% else %> +

    No other reports against this user!

    + <% end %> +
    -<% end %> -
    + +
    +

    Comments on this issue:

    <%= render 'comments', comments: @comments %>
    + diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 7a422700d..41d7b0064 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -82,7 +82,7 @@ <% end %>
  • - <%= link_to 'Report', new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name, user_id: @this_user.id) %> + <%= link_to t('user.view.report'), new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name, reported_user_id: @this_user.id) %>
    • <% if @this_user.blocks.exists? %>
  • diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index f3f2a6859..e46cc3c26 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1972,6 +1972,7 @@ en-GB: friends_diaries: friends' diary entries nearby_changesets: nearby user changesets nearby_diaries: nearby user diary entries + report: Report User popup: your location: Your location nearby mapper: Nearby mapper diff --git a/config/locales/en.yml b/config/locales/en.yml index 9a03a6a7f..24a829625 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1891,6 +1891,7 @@ en: friends_diaries: "friends' diary entries" nearby_changesets: "nearby user changesets" nearby_diaries: "nearby user diary entries" + report: "Report User" popup: your location: "Your location" nearby mapper: "Nearby mapper" diff --git a/db/migrate/20150516073616_create_issues.rb b/db/migrate/20150516073616_create_issues.rb index 3a59c9eb0..32e9976a2 100644 --- a/db/migrate/20150516073616_create_issues.rb +++ b/db/migrate/20150516073616_create_issues.rb @@ -1,9 +1,11 @@ +require "migrate" + class CreateIssues < ActiveRecord::Migration def change create_table :issues do |t| - t.string :reportable_type - t.integer :reportable_id - t.integer :user_id + t.string :reportable_type, :null => false + t.integer :reportable_id, :null => false + t.integer :reported_user_id, :null => false t.integer :status t.datetime :resolved_at t.integer :resolved_by @@ -12,5 +14,11 @@ class CreateIssues < ActiveRecord::Migration t.timestamps null: false end + + add_foreign_key :issues, :users, :column => :reported_user_id,:name => "issues_reported_user_id_fkey" + + add_index :issues, :reported_user_id, + add_index :issues, [:reportable_id, :reportable_type] + end end diff --git a/db/migrate/20150516075620_create_reports.rb b/db/migrate/20150516075620_create_reports.rb index bcdc3104e..abae0f705 100644 --- a/db/migrate/20150516075620_create_reports.rb +++ b/db/migrate/20150516075620_create_reports.rb @@ -9,5 +9,12 @@ class CreateReports < ActiveRecord::Migration t.timestamps null: false end + + add_foreign_key :reports, :issues, :name => "reports_issue_id_fkey" + add_foreign_key :reports, :users, :name => "reports_user_id_fkey" + + add_index :reports, :issue_id + add_index :reports, :user_id + end end diff --git a/db/migrate/20150526130032_create_issue_comments.rb b/db/migrate/20150526130032_create_issue_comments.rb index 92b328f9a..63f628354 100644 --- a/db/migrate/20150526130032_create_issue_comments.rb +++ b/db/migrate/20150526130032_create_issue_comments.rb @@ -8,5 +8,12 @@ class CreateIssueComments < ActiveRecord::Migration t.timestamps null: false end + + add_foreign_key :issue_comments, :issues, :name => "issue_comments_issue_id_fkey" + add_foreign_key :issue_comments, :users, :name => "issue_comments_user_id" + + add_index :issue_comments, :user_id + add_index :issue_comments, :issue_id + end end diff --git a/db/migrate/20150528113100_add_foreign_keys_for_issues.rb b/db/migrate/20150528113100_add_foreign_keys_for_issues.rb deleted file mode 100644 index 4d0d28e8d..000000000 --- a/db/migrate/20150528113100_add_foreign_keys_for_issues.rb +++ /dev/null @@ -1,11 +0,0 @@ -require "migrate" - -class AddForeignKeysForIssues < ActiveRecord::Migration - def change - add_foreign_key :issues, :users, :name => "issues_user_id_fkey" - add_foreign_key :reports, :issues, :name => "reports_issue_id_fkey" - add_foreign_key :reports, :users, :name => "reports_user_id_fkey" - add_foreign_key :issue_comments, :issues, :name => "issue_comments_issue_id_fkey" - add_foreign_key :issue_comments, :users, :name => "issue_comments_user_id" - end -end diff --git a/db/migrate/20150528114520_add_indexes_for_issues.rb b/db/migrate/20150528114520_add_indexes_for_issues.rb deleted file mode 100644 index 071bf4f4f..000000000 --- a/db/migrate/20150528114520_add_indexes_for_issues.rb +++ /dev/null @@ -1,19 +0,0 @@ -class AddIndexesForIssues < ActiveRecord::Migration - def self.up - add_index :issues, :user_id - add_index :issues, [:reportable_id, :reportable_type] - add_index :reports, :issue_id - add_index :reports, :user_id - add_index :issue_comments, :user_id - add_index :issue_comments, :issue_id - end - - def self.down - remove_index :issues, :user_id - remove_index :issues, [:reportable_id, :reportable_type] - remove_index :reports, :issue_id - remove_index :reports, :user_id - remove_index :issue_comments, :user_id - remove_index :issue_comments, :issue_id - end -end diff --git a/db/structure.sql b/db/structure.sql index f0a07adf5..efabdbee6 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -702,9 +702,9 @@ ALTER SEQUENCE issue_comments_id_seq OWNED BY issue_comments.id; CREATE TABLE issues ( id integer NOT NULL, - reportable_type character varying, - reportable_id integer, - user_id integer, + reportable_type character varying NOT NULL, + reportable_id integer NOT NULL, + reported_user_id integer NOT NULL, status integer, resolved_at timestamp without time zone, resolved_by integer, @@ -1989,20 +1989,6 @@ CREATE INDEX index_issue_comments_on_issue_id ON issue_comments USING btree (iss CREATE INDEX index_issue_comments_on_user_id ON issue_comments USING btree (user_id); --- --- Name: index_issues_on_reportable_id_and_reportable_type; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE INDEX index_issues_on_reportable_id_and_reportable_type ON issues USING btree (reportable_id, reportable_type); - - --- --- Name: index_issues_on_user_id; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE INDEX index_issues_on_user_id ON issues USING btree (user_id); - - -- -- Name: index_note_comments_on_body; Type: INDEX; Schema: public; Owner: - -- @@ -2150,6 +2136,20 @@ CREATE INDEX relations_changeset_id_idx ON relations USING btree (changeset_id); CREATE INDEX relations_timestamp_idx ON relations USING btree ("timestamp"); +-- +-- Name: reportable_object_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX reportable_object_idx ON issues USING btree (reportable_id, reportable_type); + + +-- +-- Name: reported_user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX reported_user_id_idx ON issues USING btree (reported_user_id); + + -- -- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: - -- @@ -2458,11 +2458,11 @@ ALTER TABLE ONLY issue_comments -- --- Name: issues_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: issues_reported_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY issues - ADD CONSTRAINT issues_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id); + ADD CONSTRAINT issues_reported_user_id_fkey FOREIGN KEY (reported_user_id) REFERENCES users(id); -- @@ -2789,10 +2789,6 @@ INSERT INTO schema_migrations (version) VALUES ('20150516075620'); INSERT INTO schema_migrations (version) VALUES ('20150526130032'); -INSERT INTO schema_migrations (version) VALUES ('20150528113100'); - -INSERT INTO schema_migrations (version) VALUES ('20150528114520'); - INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22');