From f57f352838d0b31c112779f8de5d6d7fa42b2da2 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 15 Jan 2017 00:29:45 +0000 Subject: [PATCH 1/6] Name changes: format processed requests more nicely. --- app/assets/stylesheets/common/tables.css.scss | 8 +++ .../user_name_change_requests.css.scss | 2 +- app/models/user_name_change_request.rb | 4 ++ .../user_name_change_requests/show.html.erb | 64 ++++++++++++------- 4 files changed, 55 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/common/tables.css.scss b/app/assets/stylesheets/common/tables.css.scss index 5d61d6852..17d7e2e52 100644 --- a/app/assets/stylesheets/common/tables.css.scss +++ b/app/assets/stylesheets/common/tables.css.scss @@ -55,3 +55,11 @@ table.search { vertical-align: top; } } + +table.aligned-vertical { + @extend table.search; + + tr { + height: 1.75em; + } +} diff --git a/app/assets/stylesheets/specific/user_name_change_requests.css.scss b/app/assets/stylesheets/specific/user_name_change_requests.css.scss index bfacee695..84324a551 100644 --- a/app/assets/stylesheets/specific/user_name_change_requests.css.scss +++ b/app/assets/stylesheets/specific/user_name_change_requests.css.scss @@ -28,4 +28,4 @@ section { margin-bottom: 1em; } -} \ No newline at end of file +} diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb index ec95a1f87..10c1ff795 100644 --- a/app/models/user_name_change_request.rb +++ b/app/models/user_name_change_request.rb @@ -36,6 +36,10 @@ class UserNameChangeRequest < ActiveRecord::Base def approved? status == "approved" end + + def pending? + status == "pending" + end def normalize_name self.desired_name = desired_name.strip.gsub(/ /, "_") diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index 86275df27..6e4f5f4c2 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -1,14 +1,45 @@

Name Change Request

- -
-

<%= @change_request.original_name %> is requesting to change their name to <%= @change_request.desired_name %>.

-
- -
-

Reason

-

<%= @change_request.change_reason %>

-
+ + + + + + + + + + + + + + + + + + + + + + + + +
Date + <%= compact_time @change_request.created_at %> + <% if @change_request.updated_at - @change_request.created_at > 5.minutes %> + (updated <%= time_ago_in_words_tagged @change_request.updated_at %>) + <% end %> +
User<%= link_to_user @change_request.user %>
Request + <%= @change_request.original_name %> -> + <%= @change_request.desired_name %> +
Reason<%= @change_request.change_reason %>
Status + <%= @change_request.status %> + <% if @change_request.approved? %> + by <%= link_to_user @change_request.approver %> + <% elsif @change_request.rejected? %> + for reason: <%= link_to @change_request.rejection_reason %> + <% end %> +

Feedback

@@ -16,7 +47,7 @@ <% @change_request.feedback.each do |feedback| %> <% end %> @@ -33,17 +64,7 @@
- <% if @change_request.rejected? %> -
-

Request was rejected

-
- - <% elsif @change_request.approved? && @change_request.approver %> -
-

Request was approved by <%= @change_request.approver.name %>

-
- - <% elsif CurrentUser.user.is_admin? %> + <% if @change_request.pending? && CurrentUser.user.is_admin? %>

Options

<%= form_tag(approve_user_name_change_request_path(@change_request)) do %> @@ -69,4 +90,3 @@ <% end %>
- From 66e30b323c909a2dfc6011d23da2f31abaf30a32 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 14 Jan 2017 23:34:07 +0000 Subject: [PATCH 2/6] Name changes: remove delete request button. --- app/controllers/user_name_change_requests_controller.rb | 8 +------- app/views/user_name_change_requests/show.html.erb | 6 ------ .../user_name_change_requests_controller_test.rb | 7 ------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index 9c2eaaf61..ddfdbd734 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -1,6 +1,6 @@ class UserNameChangeRequestsController < ApplicationController before_filter :gold_only, :only => [:new, :create, :show] - before_filter :admin_only, :only => [:index, :approve, :reject, :destroy] + before_filter :admin_only, :only => [:index, :approve, :reject] rescue_from User::PrivilegeError, :with => :access_denied def new @@ -38,12 +38,6 @@ class UserNameChangeRequestsController < ApplicationController redirect_to user_name_change_request_path(@change_request), :notice => "Name change request approved" end - def destroy - @change_request = UserNameChangeRequest.find(params[:id]) - @change_request.destroy - redirect_to user_name_change_requests_path - end - def reject @change_request = UserNameChangeRequest.find(params[:id]) @change_request.reject!(params[:reason]) diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index 6e4f5f4c2..bc7e75f54 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -83,10 +83,4 @@ <% end %> <% end %> - -
- <%= form_tag(user_name_change_request_path(@change_request), :method => :delete) do %> - <%= submit_tag "Delete" %> - <% end %> -
diff --git a/test/functional/user_name_change_requests_controller_test.rb b/test/functional/user_name_change_requests_controller_test.rb index 03752e1a9..d9ae1fd41 100644 --- a/test/functional/user_name_change_requests_controller_test.rb +++ b/test/functional/user_name_change_requests_controller_test.rb @@ -61,13 +61,6 @@ class UserNameChangeRequestsControllerTest < ActionController::TestCase assert_redirected_to(user_name_change_request_path(@change_request)) end end - - context "destroy action" do - should "destroy" do - post :destroy, {:id => @change_request.id}, {:user_id => @admin.id} - assert_redirected_to(user_name_change_requests_path) - end - end end end end From 047d3675e92d3f992369dbecd601f7e2917db58b Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 15 Jan 2017 00:41:45 +0000 Subject: [PATCH 3/6] Name changes: don't show user feedback/stats for processed requests. --- .../user_name_change_requests/show.html.erb | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index bc7e75f54..2104addc3 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -40,31 +40,31 @@ - -
-

Feedback

-
    - <% @change_request.feedback.each do |feedback| %> - - <% end %> -
-
- -
-

Statistics

-
    -
  • Level: <%= @change_request.user.level_string %>
    • -
  • Uploads: <%= link_to @change_request.user.post_upload_count, posts_path("user:#{@change_request.user.name}") %>
    • -
  • Updates: <%= link_to @change_request.user.post_update_count, post_versions_path(:search => {:updater_id => @change_request.user.id}) %>
    • -
  • Notes: <%= link_to @change_request.user.note_update_count, note_versions_path(:search => {:updater_id => @change_request.user.id}) %>
    • -
  • Favorites: <%= @change_request.user.favorite_count %>
    • -
-
<% if @change_request.pending? && CurrentUser.user.is_admin? %> +
+

Feedback

+
    + <% @change_request.feedback.each do |feedback| %> + + <% end %> +
+
+ +
+

Statistics

+
    +
  • Level: <%= @change_request.user.level_string %>
    • +
  • Uploads: <%= link_to @change_request.user.post_upload_count, posts_path("user:#{@change_request.user.name}") %>
    • +
  • Updates: <%= link_to @change_request.user.post_update_count, post_versions_path(:search => {:updater_id => @change_request.user.id}) %>
    • +
  • Notes: <%= link_to @change_request.user.note_update_count, note_versions_path(:search => {:updater_id => @change_request.user.id}) %>
    • +
  • Favorites: <%= @change_request.user.favorite_count %>
    • +
+
+

Options

<%= form_tag(approve_user_name_change_request_path(@change_request)) do %> From 9e9fdcb55d926755029b7a2d5c8ac90c33b814b4 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 15 Jan 2017 03:23:41 +0000 Subject: [PATCH 4/6] Name changes: make /user_name_change_requests member+; add reason/status/date. --- .../user_name_change_requests_controller.rb | 7 ++--- .../user_name_change_requests/index.html.erb | 26 ++++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index ddfdbd734..a367788f5 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -1,6 +1,7 @@ class UserNameChangeRequestsController < ApplicationController - before_filter :gold_only, :only => [:new, :create, :show] - before_filter :admin_only, :only => [:index, :approve, :reject] + before_filter :member_only, :only => [:index, :show] + before_filter :gold_only, :only => [:new, :create] + before_filter :admin_only, :only => [:approve, :reject] rescue_from User::PrivilegeError, :with => :access_denied def new @@ -29,7 +30,7 @@ class UserNameChangeRequestsController < ApplicationController end def index - @change_requests = UserNameChangeRequest.order("id desc").paginate(params[:page], :limit => params[:limit]) + @change_requests = UserNameChangeRequest.visible.order("id desc").paginate(params[:page], :limit => params[:limit]) end def approve diff --git a/app/views/user_name_change_requests/index.html.erb b/app/views/user_name_change_requests/index.html.erb index 6cdb482fd..99ee015bc 100644 --- a/app/views/user_name_change_requests/index.html.erb +++ b/app/views/user_name_change_requests/index.html.erb @@ -5,15 +5,35 @@ User - Desired + Request + Reason + Status + Date <% @change_requests.each do |change_request| %> - <%= link_to change_request.original_name, user_path(change_request.user_id) %> - <%= change_request.desired_name %> + <%= link_to_user change_request.user %> + + <%= change_request.original_name %> -> + <%= change_request.desired_name %> + + + <% if CurrentUser.is_admin? || CurrentUser.user == change_request.user %> + <%= change_request.change_reason %> + <% end %> + + + <%= change_request.status %> + <% if change_request.approved? %> + by <%= link_to_user change_request.approver %> + <% elsif change_request.rejected? %> + for reason: <%= link_to change_request.rejection_reason %> + <% end %> + + <%= compact_time change_request.created_at %> <%= link_to "view", user_name_change_request_path(change_request) %> <% end %> From d31a0c23f35d666764a93082a141741a2b535dbc Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 15 Jan 2017 03:29:55 +0000 Subject: [PATCH 5/6] Name changes: add API endpoints for /user_name_change_requests. --- app/controllers/user_name_change_requests_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index a367788f5..5cbed2686 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -3,6 +3,7 @@ class UserNameChangeRequestsController < ApplicationController before_filter :gold_only, :only => [:new, :create] before_filter :admin_only, :only => [:approve, :reject] rescue_from User::PrivilegeError, :with => :access_denied + respond_to :html, :json, :xml def new end @@ -27,10 +28,12 @@ class UserNameChangeRequestsController < ApplicationController def show @change_request = UserNameChangeRequest.find(params[:id]) check_privileges!(@change_request) + respond_with(@change_request) end def index @change_requests = UserNameChangeRequest.visible.order("id desc").paginate(params[:page], :limit => params[:limit]) + respond_with(@change_requests) end def approve From f0bdf565fe2ee4962aa2b4c84a4f8f7df07a7252 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 15 Jan 2017 00:54:16 +0000 Subject: [PATCH 6/6] Name changes: add listing/new/help links to subnav. --- .../user_name_change_requests/_secondary_links.html.erb | 7 +++++++ app/views/user_name_change_requests/index.html.erb | 2 ++ app/views/user_name_change_requests/new.html.erb | 2 ++ app/views/user_name_change_requests/show.html.erb | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 app/views/user_name_change_requests/_secondary_links.html.erb diff --git a/app/views/user_name_change_requests/_secondary_links.html.erb b/app/views/user_name_change_requests/_secondary_links.html.erb new file mode 100644 index 000000000..36fb8c1de --- /dev/null +++ b/app/views/user_name_change_requests/_secondary_links.html.erb @@ -0,0 +1,7 @@ +<% content_for(:secondary_links) do %> + +
  • <%= link_to "Listing", user_name_change_requests_path %>
    • +
  • <%= link_to "New", new_user_name_change_request_path %>
    • +
  • <%= link_to "Help", wiki_pages_path(:search => {:title => "help:user_name_change_requests"}) %>
    • +     +<% end %> diff --git a/app/views/user_name_change_requests/index.html.erb b/app/views/user_name_change_requests/index.html.erb index 99ee015bc..83f8b3fc3 100644 --- a/app/views/user_name_change_requests/index.html.erb +++ b/app/views/user_name_change_requests/index.html.erb @@ -42,3 +42,5 @@ <%= numbered_paginator(@change_requests) %> + +<%= render "secondary_links" %> diff --git a/app/views/user_name_change_requests/new.html.erb b/app/views/user_name_change_requests/new.html.erb index 08db5a1af..6fc582a58 100644 --- a/app/views/user_name_change_requests/new.html.erb +++ b/app/views/user_name_change_requests/new.html.erb @@ -19,3 +19,5 @@ <%= submit_tag "Submit", :data => { :disable_with => "Submitting..." } %> <% end %> + +<%= render "secondary_links" %> diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index 2104addc3..d1998fe04 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -84,3 +84,5 @@
    <% end %> + +<%= render "secondary_links" %>