Yuki Takei 9 лет назад
Родитель
Сommit
cc7e024773
2 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      resource/js/app.js
  2. 4 4
      resource/js/components/Page/RevisionUrl.js

+ 1 - 1
resource/js/app.js

@@ -64,7 +64,7 @@ const componentMappings = {
 };
 if (pagePath) {
   componentMappings['revision-path'] = <RevisionPath pagePath={pagePath} />;
-  componentMappings['revision-url'] = <RevisionUrl pagePath={pagePath} url={location.href} />;
+  componentMappings['revision-url'] = <RevisionUrl pageId={pageId} pagePath={pagePath} />;
 }
 
 Object.keys(componentMappings).forEach((key) => {

+ 4 - 4
resource/js/components/Page/RevisionUrl.js

@@ -15,11 +15,11 @@ export default class RevisionUrl extends React.Component {
       fontSize: "1em"
     }
 
-    const urlText = decodeURIComponent(this.props.url);
-    const copiedText = this.props.pagePath + '\n' + this.props.url;
+    const url = `${location.origin}/${this.props.pageId}`;
+    const copiedText = this.props.pagePath + '\n' + url;
     return (
       <span>
-        {urlText}
+        {url}
         <CopyButton buttonId="btnCopyRevisionUrl" text={copiedText}
             buttonClassName="btn btn-default" buttonStyle={buttonStyle} iconClassName="fa fa-link text-muted" />
       </span>
@@ -28,6 +28,6 @@ export default class RevisionUrl extends React.Component {
 }
 
 RevisionUrl.propTypes = {
+  pageId: React.PropTypes.string.isRequired,
   pagePath: React.PropTypes.string.isRequired,
-  url: React.PropTypes.string.isRequired,
 };