Explorar el Código

successfully for a while

ryuichi-e hace 5 años
padre
commit
13c3b961ea

+ 3 - 4
src/client/js/components/Admin/Security/ShareLinkSetting.jsx

@@ -71,11 +71,11 @@ class ShareLinkSetting extends React.Component {
     const { adminGeneralSecurityContainer } = this.props;
 
     const pager = (
-      <div className="my-3">
+      <div className="pull-right my-3">
         <PaginationWrapper
           activePage={adminGeneralSecurityContainer.state.activePage}
           changePage={this.handlePage}
-          totalItemsCount={adminGeneralSecurityContainer.state.totalLinks}
+          totalItemsCount={adminGeneralSecurityContainer.state.totalshareLinks}
           pagingLimit={adminGeneralSecurityContainer.state.pagingLimit}
         />
       </div>
@@ -85,10 +85,10 @@ class ShareLinkSetting extends React.Component {
     return (
       <Fragment>
         <div className="mb-3">
+          <button className="pull-right btn btn-danger" type="button">Delete all links</button>
           <h2 className="alert-anchor border-bottom">Shared Link List</h2>
         </div>
 
-        <button className="pull-right btn btn-danger" type="button">Delete all links</button>
         {pager}
         <div className="table-responsive">
           <table className="table table-bordered">
@@ -116,7 +116,6 @@ class ShareLinkSetting extends React.Component {
             </tbody>
           </table>
         </div>
-        {pager}
 
       </Fragment>
     );

+ 2 - 2
src/client/js/services/AdminGeneralSecurityContainer.js

@@ -31,7 +31,7 @@ export default class AdminGeneralSecurityContainer extends Container {
       isTwitterEnabled: false,
       setupStrategies: [],
       shareLinks: [],
-      totalUsers: 0,
+      totalshareLinks: 0,
       pagingLimit: Infinity,
       activePage: 1,
     };
@@ -164,7 +164,7 @@ export default class AdminGeneralSecurityContainer extends Container {
       page,
     };
 
-    const { data } = await this.appContainer.apiv3.get('/all-share-links/', params);
+    const { data } = await this.appContainer.apiv3.get('/security-setting/all-share-links', params);
 
     if (data.paginateResult == null) {
       throw new Error('data must conclude \'paginateResult\' property.');

+ 3 - 3
src/server/routes/apiv3/security-setting.js

@@ -565,20 +565,20 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: suceed to get all share links
    */
-  router.get('/all-share-links/', /* loginRequiredStrictly, adminRequired, csrf */ async(req, res) => {
+  router.get('/all-share-links/', /* loginRequiredStrictly, adminRequired, csrf, */ async(req, res) => {
     const ShareLink = crowi.model('ShareLink');
     const page = parseInt(req.query.page) || 1;
     const limit = 10;
     const linkQuery = {};
     try {
-      const shareLinksResult = await ShareLink.paginate(
+      const paginateResult = await ShareLink.paginate(
         linkQuery,
         {
           page,
           limit,
         },
       );
-      return res.apiv3({ shareLinksResult });
+      return res.apiv3({ paginateResult });
     }
     catch (err) {
       const msg = 'Error occured in get share link';