diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 64ad93fc8..05f763ed6 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -111,7 +111,7 @@ class NewHeader extends Component { } onGlobalSearch=(value,item)=>{ - window.location.href=`${item && item.url}?value=` + value; + window.location.href=`${item}?value=` + value; } openNotification = (messge) => { @@ -577,8 +577,8 @@ class NewHeader extends Component { }) } - let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="ๆœ็ดข"); - let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="้€š็Ÿฅ"); + let search_url = settings && settings.common && settings.common.search; + let notice_url = settings && settings.common && settings.common.notice; return (
@@ -646,7 +646,7 @@ class NewHeader extends Component { }
- {search_url && search_url.length>0 ? this.SearchInput(openSearch,search_url[0]):""} + {search_url ? this.SearchInput(openSearch,search_url):""} { current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? @@ -654,10 +654,10 @@ class NewHeader extends Component { :"" } - {this.props.user && this.props.user.login && (notice_url && notice_url.length>0) ? + {this.props.user && this.props.user.login && notice_url ?
{user && user.login && - +