zahmis 5 lat temu
rodzic
commit
1423f72e61

+ 1 - 4
src/client/js/components/Page/PageManagement.jsx

@@ -14,9 +14,7 @@ import CreateTemplateModal from '../CreateTemplateModal';
 
 const PageManagement = (props) => {
   const { t, appContainer, pageContainer } = props;
-  const {
-    path, isDeletable, isAbleToDeleteCompletely,
-  } = pageContainer.state;
+  const { path, isDeletable, isAbleToDeleteCompletely } = pageContainer.state;
 
   const { currentUser } = appContainer;
   const isTopPagePath = isTopPage(path);
@@ -92,7 +90,6 @@ const PageManagement = (props) => {
     );
   }
 
-
   function renderModals() {
     return (
       <>

+ 16 - 5
src/client/js/components/PageDuplicateModal.jsx

@@ -14,11 +14,9 @@ import PageContainer from '../services/PageContainer';
 import PagePathAutoComplete from './PagePathAutoComplete';
 import ApiErrorMessage from './PageManagement/ApiErrorMessage';
 
-
 const PageDuplicateModal = (props) => {
   const { t, appContainer, pageContainer } = props;
 
-
   const config = appContainer.getConfig();
   const isReachable = config.isSearchServiceReachable;
   const { pageId, path } = pageContainer.state;
@@ -88,9 +86,22 @@ const PageDuplicateModal = (props) => {
             </div>
             <div className="flex-fill">
               {isReachable ? (
-                <PagePathAutoComplete crowi={appContainer} initializedPath={path} onSubmit={ppacSubmitHandler} onInputChange={ppacInputChangeHandler} />
-              ) : (
-                <input type="text" value={pageNameInput} className="form-control" onChange={e => inputChangeHandler(e.target.value)} required />
+
+                <PagePathAutoComplete
+                  crowi={appContainer}
+                  initializedPath={path}
+                  onSubmit={ppacSubmitHandler}
+                  onInputChange={ppacInputChangeHandler}
+                />
+              )
+              : (
+                <input
+                  type="text"
+                  value={pageNameInput}
+                  className="form-control"
+                  onChange={e => inputChangeHandler(e.target.value)}
+                  required
+                />
               )}
             </div>
           </div>

+ 2 - 2
src/server/routes/index.js

@@ -147,8 +147,8 @@ module.exports = function(crowi, app) {
   app.post('/_api/pages.rename'       , accessTokenParser , loginRequiredStrictly , csrf, page.api.rename);
   app.post('/_api/pages.remove'       , loginRequiredStrictly , csrf, page.api.remove); // (Avoid from API Token)
   app.post('/_api/pages.revertRemove' , loginRequiredStrictly , csrf, page.api.revertRemove); // (Avoid from API Token)
-  app.post('/_api/pages.unlink', loginRequiredStrictly, csrf, page.api.unlink); // (Avoid from API Token)
-  app.post('/_api/pages.duplicate', accessTokenParser, loginRequiredStrictly, csrf, page.api.duplicate);
+  app.post('/_api/pages.unlink'       , loginRequiredStrictly , csrf, page.api.unlink); // (Avoid from API Token)
+  app.post('/_api/pages.duplicate'    , accessTokenParser     , loginRequiredStrictly, csrf, page.api.duplicate);
   app.get('/tags'                     , loginRequired, tag.showPage);
   app.get('/_api/tags.list'           , accessTokenParser, loginRequired, tag.api.list);
   app.get('/_api/tags.search'         , accessTokenParser, loginRequired, tag.api.search);