zahmis 5 tahun lalu
induk
melakukan
2b21161af1

+ 11 - 3
src/client/js/components/Page/RenamedAlert.jsx

@@ -1,20 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
+import { withUnstatedContainers } from '../UnstatedUtils';
+import PageContainer from '../../services/PageContainer';
 
 
 const RenamedAlert = (props) => {
-  const { t } = props;
+  const { t, pageContainer } = props;
+  const { beforePathRenamed } = pageContainer.state;
 
   return (
     <>
-      <strong>{ t('Moved') }:</strong>{t('page_page.notice.moved')}
+      <strong>{ t('Moved') }: {beforePathRenamed} </strong>{t('page_page.notice.moved')}
     </>
   );
 };
 
+const RenamedAlertlWrapper = withUnstatedContainers(RenamedAlert, [PageContainer]);
+
+
 RenamedAlert.propTypes = {
   t: PropTypes.func.isRequired, // i18next
+  pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
+
 };
 
-export default withTranslation()(RenamedAlert);
+export default withTranslation()(RenamedAlertlWrapper);

+ 1 - 1
src/client/js/services/PageContainer.js

@@ -54,7 +54,7 @@ export default class PageContainer extends Container {
       seenUsers: [],
       seenUserIds: mainContent.getAttribute('data-page-ids-of-seen-users'),
       countOfSeenUsers: mainContent.getAttribute('data-page-count-of-seen-users'),
-      redirectForm: mainContent.getAttribute('data-page-redirect-form'),
+      beforePathRenamed: mainContent.getAttribute('data-page-path-before-renamed'),
       beforePathDuplicated: mainContent.getAttribute('data-page-path-before-duplicated'),
 
       likerUsers: [],

+ 1 - 1
src/server/views/widget/page_content.html

@@ -18,7 +18,7 @@
   data-page-is-deletable="{% if isDeletablePage() %}true{% else %}false{% endif %}"
   data-page-is-not-creatable="false"
   data-page-path-before-duplicated="{{req.query.duplicated}}"
-  data-page-redirect-form="{{req.query.redirectFrom}}"
+  data-page-path-before-renamed="{{req.query.renamedFrom}}"
   data-page-is-able-to-delete-completely="{% if user.canDeleteCompletely(page.creator._id) %}true{% else %}false{% endif %}"
   data-slack-channels="{{ slack|default('') }}"
   data-page-created-at="{% if page %}{{ page.createdAt|datetz('Y/m/d H:i:s') }}{% endif %}"