Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression: Various search provider fixes #10591

Merged
merged 9 commits into from
Apr 27, 2018
Merged

Regression: Various search provider fixes #10591

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83019f3
should fix the issue that suggestions are still displayed even if sea…
tkurz Apr 25, 2018
08ab999
add link to chatpal.io to the admin ui
tkurz Apr 25, 2018
6bee337
remove unsed icon and change icon size in order to fix firefox displa…
tkurz Apr 25, 2018
41847ff
Merge branch 'develop' into hotfix/search-provider-fixes-for-0.64
tkurz Apr 26, 2018
3a1ab40
Merge branch 'develop' into hotfix/search-provider-fixes-for-0.64
engelgabriel Apr 26, 2018
01dfdfa
should fix the issue with the event trigger for search providers
tkurz Apr 27, 2018
7414e0b
Merge branch 'hotfix/search-provider-fixes-for-0.64' of https://githu…
tkurz Apr 27, 2018
a7b4897
Update deleteMessage.js
sampaiodiego Apr 27, 2018
035e883
Always call afterDeleteMessage calback
sampaiodiego Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/chatpal-search/client/template/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
{{#unless isAdmin}}
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
<p>{{{_ "Chatpal_Get_more_information_about_chatpal_on_our_website"}}}</p>
<form>
<div class="rocket-form">
<fieldset>
Expand Down
1 change: 0 additions & 1 deletion packages/chatpal-search/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Package.onUse(function(api) {
]);

api.addFiles('server/asset/chatpal-enter.svg', 'server', {isAsset:true});
api.addFiles('server/asset/chatpal-logo-icon-lightblue.svg', 'server', {isAsset:true});
api.addFiles('server/asset/chatpal-logo-icon-darkblue.svg', 'server', {isAsset:true});

api.addFiles([
Expand Down
2 changes: 1 addition & 1 deletion packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/chatpal-search/server/asset/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* globals Inject */

Inject.rawBody('chatpal-enter', Assets.getText('server/asset/chatpal-enter.svg'));
Inject.rawBody('chatpal-logo-icon-lightblue', Assets.getText('server/asset/chatpal-logo-icon-lightblue.svg'));
Inject.rawBody('chatpal-logo-icon-darkblue', Assets.getText('server/asset/chatpal-logo-icon-darkblue.svg'));
3 changes: 2 additions & 1 deletion packages/rocketchat-i18n/i18n/de.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@
"Chatpal_ERROR_username_already_exists": "Benutzername existiert bereits",
"Chatpal_created_key_successfully": "API-Key erfolgreich erstellt",
"Chatpal_run_search": "Suche",
"Chatpal_Get_more_information_about_chatpal_on_our_website": "Finden Sie mehr über Chatpal heraus, unter <a target=\"_blank\" href=\"http://chatpal.io\">http://chatpal.io</a>!",
"CDN_PREFIX": "CDN-Präfix",
"Certificates_and_Keys": "Zertifikate und Schlüssel",
"Change_Room_Type": "Ändere den Typ des Raums",
Expand Down Expand Up @@ -2343,4 +2344,4 @@
"your_message_optional": "Ihre optionale Nachricht",
"Your_password_is_wrong": "Falsches Passwort",
"Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
}
}
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@
"Chatpal_ERROR_username_already_exists": "Username already exists",
"Chatpal_created_key_successfully": "API-Key created successfully",
"Chatpal_run_search": "Search",
"Chatpal_Get_more_information_about_chatpal_on_our_website": "Get more information about Chatpal on <a target=\"_blank\" href=\"http://chatpal.io\">http://chatpal.io</a>!",
"CDN_PREFIX": "CDN Prefix",
"Certificates_and_Keys": "Certificates and Keys",
"Change_Room_Type": "Changing the Room Type",
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-lib/server/functions/deleteMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RocketChat.deleteMessage = function(message, user) {
}

Meteor.defer(function() {
RocketChat.callbacks.run('afterDeleteMessage', deletedMsg);
RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message._id });
Copy link
Contributor

@graywolf336 graywolf336 Apr 27, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sampaiodiego should this call to the callbacks be ran outside the if (keepHistory)? Because if that setting is true, the message is being deleted to the user's perspective even though we aren't technically deleting it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right.. since the message will be suppressed from any endpoint, we should call the callback. I'll change it to reflect that.

});
}

Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-search/client/search/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ Template.RocketSearch.onCreated(function() {
//TODO what should happen
} else {
this.suggestionActive.set(undefined);
this.suggestions.set(result);
if (value !== this.scope.text.get()) {
this.suggestions.set(result);
}
}
});
};
Expand Down