Browse Source

add frag whether set site url

yusuketk 6 years ago
parent
commit
3aaa8eb7a9
1 changed files with 5 additions and 2 deletions
  1. 5 2
      src/client/js/components/Admin/App/SiteUrlSetting.jsx

+ 5 - 2
src/client/js/components/Admin/App/SiteUrlSetting.jsx

@@ -18,8 +18,10 @@ class SiteUrlSetting extends React.Component {
     this.state = {
     this.state = {
       siteUrl: '',
       siteUrl: '',
       envSiteUrl: '',
       envSiteUrl: '',
+      isSettingSiteUrl: true,
     };
     };
 
 
+    this.envSiteUrl = '';
     this.submitHandler = this.submitHandler.bind(this);
     this.submitHandler = this.submitHandler.bind(this);
     this.inputSiteUrlChangeHandler = this.inputSiteUrlChangeHandler.bind(this);
     this.inputSiteUrlChangeHandler = this.inputSiteUrlChangeHandler.bind(this);
   }
   }
@@ -30,8 +32,9 @@ class SiteUrlSetting extends React.Component {
       const appSettingParams = response.data.appSettingParams;
       const appSettingParams = response.data.appSettingParams;
 
 
       this.setState({
       this.setState({
-        siteUrl: appSettingParams.siteUrl || '',
+        siteUrl: appSettingParams.siteUrl || appSettingParams.envSiteUrl || '',
         envSiteUrl: appSettingParams.envSiteUrl || '',
         envSiteUrl: appSettingParams.envSiteUrl || '',
+        isSettingSiteUrl: !!appSettingParams.siteUrl,
       });
       });
     }
     }
     catch (err) {
     catch (err) {
@@ -67,7 +70,7 @@ class SiteUrlSetting extends React.Component {
     return (
     return (
       <React.Fragment>
       <React.Fragment>
         <p className="well">{t('app_setting.Site URL desc')}</p>
         <p className="well">{t('app_setting.Site URL desc')}</p>
-        {!this.state.siteUrl && (<p className="alert alert-danger"><i className="icon-exclamation"></i> {t('app_setting.Site URL warn')}</p>)}
+        {!this.state.isSettingSiteUrl && (<p className="alert alert-danger"><i className="icon-exclamation"></i> {t('app_setting.Site URL warn')}</p>)}
 
 
         <div className="row">
         <div className="row">
           <div className="col-md-12">
           <div className="col-md-12">