Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
21d426821a
1 changed files with 2 additions and 1 deletions
|
@ -220,8 +220,9 @@ module.exports = React.createClass({
|
||||||
let canonical_alias_section;
|
let canonical_alias_section;
|
||||||
if (this.props.canSetCanonicalAlias) {
|
if (this.props.canSetCanonicalAlias) {
|
||||||
let found = false;
|
let found = false;
|
||||||
|
const canonicalValue = this.state.canonicalAlias || "";
|
||||||
canonical_alias_section = (
|
canonical_alias_section = (
|
||||||
<select onChange={this.onCanonicalAliasChange} value={this.state.canonicalAlias}>
|
<select onChange={this.onCanonicalAliasChange} value={canonicalValue}>
|
||||||
<option value="" key="unset">{ _t('not specified') }</option>
|
<option value="" key="unset">{ _t('not specified') }</option>
|
||||||
{
|
{
|
||||||
Object.keys(self.state.domainToAliases).map((domain, i) => {
|
Object.keys(self.state.domainToAliases).map((domain, i) => {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue