mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a hashtag public link to the trending hashtag page (#17140)

Browse Source 
* Add a hashtag public link to the hashtag management page

* Add support for element 'target' to Counter.js.
Remove 'rel' element.

* Update app/javascript/mastodon/components/admin/Counter.js

Co-authored-by: Claire <[email protected]>

Co-authored-by: Eugen Rochko <[email protected]>
Co-authored-by: Claire <[email protected]>
This commit is contained in:
mayaeh
2022-03-26 02:52:51 +01:00
committed by GitHub
co-authored by Eugen Rochko Claire
parent 6907605026
commit 52813830be
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/mastodon/components/admin/Counter.js
+3 -2
View File
@@ -33,6 +33,7 @@ export default class Counter extends React.PureComponent {
label: PropTypes.string.isRequired,
href: PropTypes.string,
params: PropTypes.object,
target: PropTypes.string,
};
state = {
@@ -54,7 +55,7 @@ export default class Counter extends React.PureComponent {
}
render () {
const { label, href } = this.props;
const { label, href, target } = this.props;
const { loading, data } = this.state;
let content;
@@ -100,7 +101,7 @@ export default class Counter extends React.PureComponent {
if (href) {
return (
<a href={href} className='sparkline'>
<a href={href} className='sparkline' target={target}>
{inner}
</a>
);
app/views/admin/tags/show.html.haml
+1 -1
View File
@@ -11,7 +11,7 @@
.dashboard
.dashboard__item
= react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure')
= react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure'), href: tag_url(@tag), target: '_blank'
.dashboard__item
= react_admin_component :counter, measure: 'tag_uses', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_uses_measure')
.dashboard__item