Просмотр исходного кода

delete invalid ManageExternalAccount

WESEEK Kaito 6 лет назад
Родитель
Сommit
c23ff303ea

+ 0 - 1
src/client/js/app.jsx

@@ -111,7 +111,6 @@ let componentMappings = {
 
   'admin-full-text-search-management': <FullTextSearchManagement />,
   'admin-customize': <Customize />,
-  'admin-external-account-setting': <ManageExternalAccount />,
 
   'staff-credit': <StaffCredit />,
   'admin-importer': <ImportDataPage />,

+ 6 - 1
src/client/js/components/Admin/ManageExternalAccount.jsx

@@ -8,7 +8,7 @@ import { createSubscribedElement } from '../UnstatedUtils';
 import AppContainer from '../../services/AppContainer';
 import AdminExternalAccountsContainer from '../../services/AdminExternalAccountsContainer';
 import ExternalAccountTable from './Users/ExternalAccountTable';
-import { toastError } from '../../util/apiNotification';
+import { toastSuccess, toastError } from '../../util/apiNotification';
 
 
 class ManageExternalAccount extends React.Component {
@@ -19,9 +19,14 @@ class ManageExternalAccount extends React.Component {
     this.handleExternalAccountPage = this.handleExternalAccountPage.bind(this);
   }
 
+  componentWillMount() {
+    this.handleExternalAccountPage(1);
+  }
+
   async handleExternalAccountPage(selectedPage) {
     try {
       await this.props.adminExternalAccountsContainer.retrieveExternalAccountsByPagingNum(selectedPage);
+      toastSuccess(' Success ');
     }
     catch (err) {
       toastError(err);

+ 3 - 3
src/client/js/components/Admin/Users/ExternalAccountTable.jsx

@@ -69,7 +69,7 @@ class ExternalAccountTable extends React.Component {
           <tbody>
             {adminExternalAccountsContainer.state.externalAccounts.map((ea) => {
               return (
-                <tr>
+                <tr key={ea._id}>
                   <td>{ea.providerType}</td>
                   <td>
                     <strong>{ea.accountId}</strong>
@@ -78,7 +78,7 @@ class ExternalAccountTable extends React.Component {
                     <strong>{ ea.user.username }</strong>
                   </td>
                   <td>
-                    { ea.password
+                    { ea.user.password
                       ? (
                         <span className="label label-info">
                           { t('user_management.set') }
@@ -100,7 +100,7 @@ class ExternalAccountTable extends React.Component {
                       <ul className="dropdown-menu" role="menu">
                         <li className="dropdown-header">{ t('user_management.edit_menu') }</li>
                         <li>
-                          <a onClick={() => { return this.removeExtenalAccount(ea.accountId) }}>
+                          <a onClick={() => { return this.removeExtenalAccount(ea._id) }}>
                             <i className="icon-fw icon-fire text-danger"></i> { t('Delete') }
                           </a>
                         </li>

+ 4 - 4
src/server/routes/admin.js

@@ -486,16 +486,16 @@ module.exports = function(crowi, app) {
 
   actions.externalAccount = {};
   actions.externalAccount.index = function(req, res) {
-    const page = parseInt(req.query.page) || 1;
-
-    ExternalAccount.findAllWithPagination({ page })
+    // const page = parseInt(req.query.page) || 1;
+    return res.render('admin/external-accounts');
+    /* ExternalAccount.findAllWithPagination({ page })
       .then((result) => {
         const pager = createPager(result.total, result.limit, result.page, MAX_PAGE_LIST);
         return res.render('admin/external-accounts', {
           accounts: result.docs,
           pager,
         });
-      });
+      }); */
   };
 
   actions.externalAccount.remove = async function(req, res) {

+ 0 - 1
src/server/routes/apiv3/users.js

@@ -355,7 +355,6 @@ module.exports = (crowi) => {
     const page = parseInt(req.query.page) || 1;
     try {
       const paginateResult = await ExternalAccount.findAllWithPagination({ page });
-      // const { docs: userGroups, total: totalUserGroups, limit: pagingLimit } = result;
       return res.apiv3({ paginateResult });
     }
     catch (err) {