IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename StaffActionLog to UserHistory

Browse Source
This commit is contained in:
Neil Lalonde
2013-09-10 21:21:16 -04:00
parent f2a1ef8d7d
commit e8ef55c446
11 changed files with 75 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/controllers/admin_logs_staff_action_logs_controller.js
View File

@@ -18,11 +18,11 @@ Discourse.AdminLogsStaffActionLogsController = Ember.ArrayController.extend(Disc
self.set('content', result);
self.set('loading', false);
});
}.observes('filters.action_name', 'filters.staff_user', 'filters.target_user', 'filters.subject'),
}.observes('filters.action_name', 'filters.acting_user', 'filters.target_user', 'filters.subject'),
filtersExists: function() {
return (_.size(this.get('filters')) > 0);
}.property('filters.action_name', 'filters.staff_user', 'filters.target_user', 'filters.subject'),
}.property('filters.action_name', 'filters.acting_user', 'filters.target_user', 'filters.subject'),
clearFilter: function(key) {
delete this.get('filters')[key];
@@ -45,8 +45,8 @@ Discourse.AdminLogsStaffActionLogsController = Ember.ArrayController.extend(Disc
}
}.property('filters.action_name'),
filterByStaffUser: function(staff_user) {
this.set('filters.staff_user', staff_user.username);
filterByStaffUser: function(acting_user) {
this.set('filters.acting_user', acting_user.username);
},
filterByTargetUser: function(target_user) {

4
app/assets/javascripts/admin/models/staff_action_log.js
View File

@@ -43,8 +43,8 @@ Discourse.StaffActionLog = Discourse.Model.extend({
Discourse.StaffActionLog.reopenClass({
create: function(attrs) {
if (attrs.staff_user) {
attrs.staff_user = Discourse.AdminUser.create(attrs.staff_user);
if (attrs.acting_user) {
attrs.acting_user = Discourse.AdminUser.create(attrs.acting_user);
}
if (attrs.target_user) {
attrs.target_user = Discourse.AdminUser.create(attrs.target_user);

6
app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars
View File

@@ -8,9 +8,9 @@
<i class="icon icon-remove-sign"></i>
</a>
{{/if}}
{{#if filters.staff_user}}
<a {{action clearFilter "staff_user"}} class="filter">
<span class="label">{{i18n admin.logs.staff_actions.staff_user}}</span>: {{filters.staff_user}}
{{#if filters.acting_user}}
<a {{action clearFilter "acting_user"}} class="filter">
<span class="label">{{i18n admin.logs.staff_actions.staff_user}}</span>: {{filters.acting_user}}
<i class="icon icon-remove-sign"></i>
</a>
{{/if}}

4
app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars
View File

@@ -1,6 +1,6 @@
<div class="col value first staff_user">
{{#linkTo 'adminUser' staff_user}}{{avatar staff_user imageSize="tiny"}}{{/linkTo}}
<a {{action filterByStaffUser staff_user}}>{{staff_user.username}}</a>
{{#linkTo 'adminUser' acting_user}}{{avatar acting_user imageSize="tiny"}}{{/linkTo}}
<a {{action filterByStaffUser acting_user}}>{{acting_user.username}}</a>
</div>
<div class="col value action">
<a {{action filterByAction action_name}}>{{actionName}}</a>