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

+ 11 - 4
src/client/js/components/Page/RedirectedAlert.jsx

@@ -1,20 +1,27 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
-
+import { withUnstatedContainers } from '../UnstatedUtils';
+import PageContainer from '../../services/PageContainer';
 
 const RedirectedAlert = (props) => {
-  const { t } = props;
+  const { t, pageContainer } = props;
+  const { beforePathRedirected } = pageContainer.state;
 
   return (
     <>
-      <strong>{ t('Redirected') }:</strong>{ t('page_page.notice.redirected')}
+      <strong>{ t('Redirected') }:</strong>{ t('page_page.notice.redirected')} <code>{beforePathRedirected}</code>
     </>
   );
 };
 
+const RedirectedAlertlWrapper = withUnstatedContainers(RedirectedAlert, [PageContainer]);
+
+
 RedirectedAlert.propTypes = {
   t: PropTypes.func.isRequired, // i18next
+  pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
+
 };
 
-export default withTranslation()(RedirectedAlert);
+export default withTranslation()(RedirectedAlertlWrapper);

+ 2 - 0
src/client/js/services/PageContainer.js

@@ -56,6 +56,8 @@ export default class PageContainer extends Container {
       countOfSeenUsers: mainContent.getAttribute('data-page-count-of-seen-users'),
       beforePathRenamed: mainContent.getAttribute('data-page-path-before-renamed'),
       beforePathDuplicated: mainContent.getAttribute('data-page-path-before-duplicated'),
+      beforePathRedirected: mainContent.getAttribute('data-page-path-before-redirected'),
+
 
       likerUsers: [],
       sumOfLikers: 0,

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

@@ -19,6 +19,7 @@
   data-page-is-not-creatable="false"
   data-page-path-before-duplicated="{{req.query.duplicated}}"
   data-page-path-before-renamed="{{req.query.renamedFrom}}"
+  data-page-path-before-redirected="{{req.query.redirectFrom}}"
   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 %}"