diff --git a/app/assets/javascripts/results.jsx b/app/assets/javascripts/results.jsx index 04762f7..22252ff 100644 --- a/app/assets/javascripts/results.jsx +++ b/app/assets/javascripts/results.jsx @@ -241,7 +241,11 @@ var Container = React.createClass({ } else if (optionSelected === "5") { type = "document" } - this.setState({entityType: type, facetsDict: {}, orgFacetsDict: {}, loadMoreResults: false, exactMatching: false, loadMergedData: false}); + if(type !== this.state.entityType){ + this.setState({entityType: type, facetsDict: {}, orgFacetsDict: {}, loadMoreResults: false, exactMatching: false, loadMergedData: false, mergeData: {1: null, 2: null}}); + } + else + this.setState({entityType: type, facetsDict: {}, orgFacetsDict: {}, loadMoreResults: false, exactMatching: false, loadMergedData: false}); }, setEntityType: function (type) { this.setState({entityType: type,facetsDict: {}, orgFacetsDict: {}, loadMoreResults: false, exactMatching: false, loadMergedData: false}); @@ -287,7 +291,7 @@ var Container = React.createClass({ type: 'GET', success: function() { console.log("success"); - alert("The data was merged"); + alert(getTranslation("merge_success_message")); this.setState({entityType: this.state.entityType, facetsDict: {}, orgFacetsDict: {}, loadMoreResults: false, exactMatching: false, loadMergedData: true, mergeData: {1: null, 2: null}}); }.bind(this), error: function(xhr) { @@ -1680,6 +1684,10 @@ var SnapshotLink = React.createClass({ window.open(url); }); } + else { + var url = context + "/screenshot?url=" + this.props.webpage; + window.open(url); + } }, render: function () { return ( @@ -1696,7 +1704,7 @@ var ProductResultElement = React.createClass({
{getTranslation("price")}: {this.props.price}
: null } { this.props.condition !== undefined ?{getTranslation("condition")}: {this.props.condition}
: null } -{getTranslation("link")}: + {getValue(this.props.webpage)}
+ : null }