github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Change watch wording to unignore (#7112)

Browse Source 
* REFACTOR: Change `watch` wording to `unignore`
This commit is contained in:
Tarek Khalil
2019-03-05 14:40:31 +00:00
committed by GitHub
parent 9e09224eb4
commit f19d36cbba
7 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/components/user-card-contents.js.es6
View File

@ -195,11 +195,6 @@ export default Ember.Component.extend(
this._close(); this._close();
}, },
watchUser() {
this.get("user").watch();
this._close();
},
showUser() { showUser() {
this.showUser(this.get("user")); this.showUser(this.get("user"));
this._close(); this._close();

4
app/assets/javascripts/discourse/controllers/user.js.es6
View File

@ -152,9 +152,9 @@ export default Ember.Controller.extend(CanCheckEmails, {
user.ignore().then(() => user.set("ignored", true)); user.ignore().then(() => user.set("ignored", true));
}, },
watchUser() { unignoreUser() {
const user = this.get("model"); const user = this.get("model");
user.watch().then(() => user.set("ignored", false)); user.unignore().then(() => user.set("ignored", false));
} }
} }
}); });

2
app/assets/javascripts/discourse/models/user.js.es6
View File

@ -622,7 +622,7 @@ const User = RestModel.extend({
}); });
}, },
watch() { unignore() {
return ajax(`${userPath(this.get("username"))}/ignore.json`, { return ajax(`${userPath(this.get("username"))}/ignore.json`, {
type: "DELETE", type: "DELETE",
data: { ignored_user_id: this.get("id") } data: { ignored_user_id: this.get("id") }

4
app/assets/javascripts/discourse/templates/user.hbs
View File

@ -53,9 +53,9 @@
<li> <li>
{{#if model.ignored}} {{#if model.ignored}}
{{d-button class="btn-default" {{d-button class="btn-default"
action=(action "watchUser") action=(action "unignoreUser")
icon="far-eye" icon="far-eye"
label="user.watch"}} label="user.unignore"}}
{{else}} {{else}}
{{d-button class="btn-danger" {{d-button class="btn-danger"
action=(action "ignoreUser") action=(action "ignoreUser")

4
app/controllers/users_controller.rb
View File

@ -14,7 +14,7 @@ class UsersController < ApplicationController
:pick_avatar, :destroy_user_image, :destroy, :check_emails, :pick_avatar, :destroy_user_image, :destroy, :check_emails,
:topic_tracking_state, :preferences, :create_second_factor, :topic_tracking_state, :preferences, :create_second_factor,
:update_second_factor, :create_second_factor_backup, :select_avatar, :update_second_factor, :create_second_factor_backup, :select_avatar,
:ignore, :watch, :revoke_auth_token :ignore, :unignore, :revoke_auth_token
] ]
skip_before_action :check_xhr, only: [ skip_before_action :check_xhr, only: [
@ -1004,7 +1004,7 @@ class UsersController < ApplicationController
render json: success_json render json: success_json
end end
def watch def unignore
raise Discourse::NotFound unless SiteSetting.ignore_user_enabled raise Discourse::NotFound unless SiteSetting.ignore_user_enabled
IgnoredUser.where(user: current_user, ignored_user_id: params[:ignored_user_id]).delete_all IgnoredUser.where(user: current_user, ignored_user_id: params[:ignored_user_id]).delete_all

2
config/locales/client.en.yml
View File

@ -637,7 +637,7 @@ en:
private_message: "Message" private_message: "Message"
private_messages: "Messages" private_messages: "Messages"
ignore: "Ignore" ignore: "Ignore"
watch: "Watch" unignore: "Unignore"
activity_stream: "Activity" activity_stream: "Activity"
preferences: "Preferences" preferences: "Preferences"
profile_hidden: "This user's public profile is hidden." profile_hidden: "This user's public profile is hidden."

2
config/routes.rb
View File

@ -422,7 +422,7 @@ Discourse::Application.routes.draw do
get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: RouteFormat.username } get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: RouteFormat.username }
get "#{root_path}/:username/summary" => "users#summary", constraints: { username: RouteFormat.username } get "#{root_path}/:username/summary" => "users#summary", constraints: { username: RouteFormat.username }
put "#{root_path}/:username/ignore" => "users#ignore", constraints: { username: RouteFormat.username } put "#{root_path}/:username/ignore" => "users#ignore", constraints: { username: RouteFormat.username }
delete "#{root_path}/:username/ignore" => "users#watch", constraints: { username: RouteFormat.username } delete "#{root_path}/:username/ignore" => "users#unignore", constraints: { username: RouteFormat.username }
get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username } get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username }
get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: RouteFormat.username } get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: RouteFormat.username }
get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: RouteFormat.username } get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: RouteFormat.username }