zahmis 5 лет назад
Родитель
Сommit
e02f5e36d7

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

@@ -36,7 +36,7 @@ const PageManagement = (props) => {
   async function openPageDuplicateModalHandler() {
   async function openPageDuplicateModalHandler() {
     setIsPageDuplicateModalShown(true);
     setIsPageDuplicateModalShown(true);
     try {
     try {
-      const res = await appContainer.apiv3Get('/pages/duplicate', { path });
+      const res = await appContainer.apiv3Get('/pages/subordinated-list', { path });
       setDuplicateModalPaths(res.data.resultPaths);
       setDuplicateModalPaths(res.data.resultPaths);
     }
     }
     catch (err) {
     catch (err) {

+ 10 - 13
src/client/js/components/PageDuplicateModal.jsx

@@ -78,21 +78,20 @@ const PageDuplicateModal = (props) => {
           <code>{path}</code>
           <code>{path}</code>
         </div>
         </div>
         <div className="form-group">
         <div className="form-group">
-          <label htmlFor="duplicatePageName">{t('modal_duplicate.label.New page name')}</label>
-          <br />
+          <label htmlFor="duplicatePageName">{ t('modal_duplicate.label.New page name') }</label><br />
           <div className="input-group">
           <div className="input-group">
             <div className="input-group-prepend">
             <div className="input-group-prepend">
               <span className="input-group-text">{crowi.url}</span>
               <span className="input-group-text">{crowi.url}</span>
             </div>
             </div>
             <div className="flex-fill">
             <div className="flex-fill">
               {isReachable
               {isReachable
-                ? (
-                  <PagePathAutoComplete
-                    crowi={appContainer}
-                    initializedPath={path}
-                    onSubmit={ppacSubmitHandler}
-                    onInputChange={ppacInputChangeHandler}
-                  />
+              ? (
+                <PagePathAutoComplete
+                  crowi={appContainer}
+                  initializedPath={path}
+                  onSubmit={ppacSubmitHandler}
+                  onInputChange={ppacInputChangeHandler}
+                />
               )
               )
               : (
               : (
                 <input
                 <input
@@ -116,7 +115,7 @@ const PageDuplicateModal = (props) => {
             onChange={changeIsDuplicateRecursivelyHandler}
             onChange={changeIsDuplicateRecursivelyHandler}
           />
           />
           <label className="custom-control-label" htmlFor="cbDuplicateRecursively">
           <label className="custom-control-label" htmlFor="cbDuplicateRecursively">
-            {t('modal_duplicate.label.Duplicate with child')}
+            { t('modal_duplicate.label.Duplicate with child') }
           </label>
           </label>
           <div>
           <div>
             <ul>
             <ul>
@@ -128,9 +127,7 @@ const PageDuplicateModal = (props) => {
       </ModalBody>
       </ModalBody>
       <ModalFooter>
       <ModalFooter>
         <ApiErrorMessage errorCode={errorCode} errorMessage={errorMessage} targetPath={pageNameInput} />
         <ApiErrorMessage errorCode={errorCode} errorMessage={errorMessage} targetPath={pageNameInput} />
-        <button type="button" className="btn btn-primary" onClick={duplicate}>
-          Duplicate page
-        </button>
+        <button type="button" className="btn btn-primary" onClick={duplicate}>Duplicate page</button>
       </ModalFooter>
       </ModalFooter>
     </Modal>
     </Modal>
   );
   );

+ 1 - 1
src/server/routes/apiv3/pages.js

@@ -83,7 +83,7 @@ module.exports = (crowi) => {
     }
     }
   });
   });
 
 
-  router.get('/duplicate', accessTokenParser, loginRequired, async(req, res) => {
+  router.get('/subordinated-list', accessTokenParser, loginRequired, async(req, res) => {
     const { path } = req.query;
     const { path } = req.query;
 
 
     const pageData = await Page.findByPath(path);
     const pageData = await Page.findByPath(path);