Fix wording "show reblogs" -> "show boosts", order reports chronologically in
admin UI
This commit is contained in:
parent
3a62721e54
commit
4b7dca4713
@ -6,7 +6,7 @@ import SettingToggle from '../../notifications/components/setting_toggle';
|
|||||||
import SettingText from './setting_text';
|
import SettingText from './setting_text';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter by regular expressions' }
|
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' }
|
||||||
});
|
});
|
||||||
|
|
||||||
const outerStyle = {
|
const outerStyle = {
|
||||||
@ -44,7 +44,7 @@ const ColumnSettings = React.createClass({
|
|||||||
<span className='column-settings--section' style={sectionStyle}><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
|
<span className='column-settings--section' style={sectionStyle}><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
|
||||||
|
|
||||||
<div style={rowStyle}>
|
<div style={rowStyle}>
|
||||||
<SettingToggle settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show reblogs' />} />
|
<SettingToggle settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show boosts' />} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style={rowStyle}>
|
<div style={rowStyle}>
|
||||||
|
@ -7,7 +7,7 @@ class Admin::ReportsController < ApplicationController
|
|||||||
layout 'admin'
|
layout 'admin'
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@reports = Report.includes(:account, :target_account).paginate(page: params[:page], per_page: 40)
|
@reports = Report.includes(:account, :target_account).order('id desc').paginate(page: params[:page], per_page: 40)
|
||||||
@reports = params[:action_taken].present? ? @reports.resolved : @reports.unresolved
|
@reports = params[:action_taken].present? ? @reports.resolved : @reports.unresolved
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user