Merge pull request #2111 from serghey-rodin/feature/improved-web-and-server

Improved server sys tab and web backend template.

src/react/src/components/Server/ServerSys.jsx

@@ -46,7 +46,7 @@ const Server = props => {
         </div>
 
         <div>
-          <button className="link-download restart" onClick={() => props.handleAction(`/api/v1/restart/service?srv=${data.NAME}`)}>
+          <button className="link-download restart" onClick={() => props.handleAction(`/api/v1/restart/system/?hostname=${data.NAME}`)}>
             {i18n.restart}
             {
               data.FOCUSED

src/react/src/components/WebDomain/Edit/EditWeb.jsx

@@ -24,6 +24,7 @@ import HtmlParser from 'react-html-parser';
 const EditWeb = props => {
   const token = localStorage.getItem("token");
   const { i18n } = useSelector(state => state.session);
+  const { session } = useSelector(state => state.userSession);
   const history = useHistory();
   const dispatch = useDispatch();
   const [errorMessage, setErrorMessage] = useState('');
@@ -184,7 +185,7 @@ const EditWeb = props => {
               title={i18n['Web Template']} />
 
             {
-              state.data.WEB_BACKEND && (
+              session.WEB_BACKEND && (
                 <SelectInput
                   options={state.data.backend_templates}
                   selected={state.data.backend_template || 'default'}