diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2018-12-31 02:57:50 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-12-30 18:57:50 +0100 |
| commit | 1340460c85bae87780f9ae41187739d01450911e (patch) | |
| tree | 6b63bbeb6a0ed107554121d91b7b81a61912291e /app | |
| parent | e74c99edf56f6aa3ec12f324f260e4d7c3a0e477 (diff) | |
If it is disabled, remove the link of the profile directory (#9665)
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 4 | ||||
| -rw-r--r-- | app/javascript/mastodon/initial_state.js | 1 | ||||
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 1ca3fbaa1..feecfd0e4 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -7,7 +7,7 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { me, invitesEnabled, version } from '../../initial_state'; +import { me, invitesEnabled, version, profile_directory } from '../../initial_state'; import { fetchFollowRequests } from '../../actions/accounts'; import { List as ImmutableList } from 'immutable'; import { Link } from 'react-router-dom'; @@ -136,7 +136,7 @@ class GettingStarted extends ImmutablePureComponent { <div className='getting-started__footer'> <ul> - <li><a href='/explore' target='_blank'><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></a> · </li> + {profile_directory && <li><a href='/explore' target='_blank'><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></a> · </li>} {invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>} {multiColumn && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>} <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li> diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index 6e9e3ddd8..b496c57d2 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -15,5 +15,6 @@ export const searchEnabled = getMeta('search_enabled'); export const invitesEnabled = getMeta('invites_enabled'); export const version = getMeta('version'); export const mascot = getMeta('mascot'); +export const profile_directory = getMeta('profile_directory'); export default initialState; diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 57f1e0098..d40379d43 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -17,6 +17,7 @@ class InitialStateSerializer < ActiveModel::Serializer version: Mastodon::Version.to_s, invites_enabled: Setting.min_invite_role == 'user', mascot: instance_presenter.mascot&.file&.url, + profile_directory: Setting.profile_directory, } if object.current_account |