summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-06 14:32:08 -0400
committerCorey Hulen <corey@hulen.com>2016-05-06 11:32:08 -0700
commite1cae3b15b1a85fcb2ef30fee0076ae3a8d23856 (patch)
treec84ff25c95f4a80bf081e60b746178c9a12b4090 /webapp/components
parent6c75662b824491a20a757a5eec59556a866374b5 (diff)
downloadchat-e1cae3b15b1a85fcb2ef30fee0076ae3a8d23856.tar.gz
chat-e1cae3b15b1a85fcb2ef30fee0076ae3a8d23856.tar.bz2
chat-e1cae3b15b1a85fcb2ef30fee0076ae3a8d23856.zip
PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON string (#2914)
* Removed unused channelId and userId parameters from web client getPublicLink method * Changed getPublicLink api call to return a proper JSON string
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/get_public_link_modal.jsx6
-rw-r--r--webapp/components/view_image.jsx2
2 files changed, 2 insertions, 6 deletions
diff --git a/webapp/components/get_public_link_modal.jsx b/webapp/components/get_public_link_modal.jsx
index 7f83651cd..c2604b3bc 100644
--- a/webapp/components/get_public_link_modal.jsx
+++ b/webapp/components/get_public_link_modal.jsx
@@ -23,8 +23,6 @@ export default class GetPublicLinkModal extends React.Component {
this.state = {
show: false,
- channelId: '',
- userId: '',
filename: '',
link: ''
};
@@ -36,7 +34,7 @@ export default class GetPublicLinkModal extends React.Component {
componentDidUpdate(prevProps, prevState) {
if (this.state.show && !prevState.show) {
- AsyncClient.getPublicLink(this.state.channelId, this.state.userId, this.state.filename, this.handlePublicLink);
+ AsyncClient.getPublicLink(this.state.filename, this.handlePublicLink);
}
}
@@ -53,8 +51,6 @@ export default class GetPublicLinkModal extends React.Component {
handleToggle(value, args) {
this.setState({
show: value,
- channelId: args.channelId,
- userId: args.userId,
filename: args.filename,
link: ''
});
diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx
index b88df19d4..ccde54c78 100644
--- a/webapp/components/view_image.jsx
+++ b/webapp/components/view_image.jsx
@@ -197,7 +197,7 @@ class ViewImageModal extends React.Component {
handleGetPublicLink() {
this.props.onModalDismissed();
- GlobalActions.showGetPublicLinkModal(this.props.channelId, this.props.userId, this.props.filenames[this.state.imgId]);
+ GlobalActions.showGetPublicLinkModal(this.props.filenames[this.state.imgId]);
}
onMouseEnterImage() {