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

Jump to bottom

[FIX] Snippetted messages not working #8937

Merged
merged 5 commits into from
Dec 8, 2017
Merged

[FIX] Snippetted messages not working #8937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c932eba
Fix snippetted messages
karlprieb Nov 23, 2017
71459c0
Merge branch 'develop' into snippetted-messages
rodrigok Dec 8, 2017
f660333
Merge branch 'develop' into snippetted-messages
rodrigok Dec 8, 2017
38dd021
Merge branch 'develop' into snippetted-messages
karlprieb Dec 8, 2017
fe24591
Merge branch 'snippetted-messages' of github.com:RocketChat/Rocket.Ch…
karlprieb Dec 8, 2017
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
20 changes: 10 additions & 10 deletions packages/rocketchat-livechat/app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/rocketchat-message-snippet/client/actionButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Meteor.startup(function() {
'message',
'message-mobile'
],
order: 10,
group: 'menu',
action() {
const message = this._arguments[1];

Expand Down Expand Up @@ -48,7 +50,7 @@ Meteor.startup(function() {
return false;
}

RocketChat.authz.hasAtLeastOnePermission('snippet-message', message.rid);
return RocketChat.authz.hasAtLeastOnePermission('snippet-message', message.rid);
}
});
});
63 changes: 0 additions & 63 deletions packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js
View file
Open in desktop

This file was deleted.

18 changes: 10 additions & 8 deletions packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template name="snippetedMessages">
<div class="list-view pinned-messages-list">
<div class="list-view snippeted-messages-list flex-tab__header">
<div class="title">
<h2>{{_ "Snippet_Messages"}}</h2>
</div>
Expand All @@ -9,14 +9,16 @@ <h2>{{_ "No_snippet_messages"}}</h2>
{{/unless}}
{{/if}}
</div>
<ul class="list clearfix">
{{#each messages}}
{{#nrr nrrargs 'snippetMessage' message}}{{/nrr}}
{{/each}}
</ul>
{{#if hasMore}}
<div class="flex-tab__result js-list">
<ul class="list clearfix">
{{#each messages}}
{{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
</ul>
{{#if hasMore}}
<div class="load-more">
{{> loading}}
</div>
{{/if}}
{{/if}}
</div>
</template>
2 changes: 0 additions & 2 deletions packages/rocketchat-message-snippet/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ Package.onUse(function(api) {
'client/page/snippetPage.js',
'client/tabBar/tabBar.js',
'client/tabBar/views/snippetedMessages.html',
'client/tabBar/views/snippetMessage.html',
'client/tabBar/views/snippetedMessages.js',
'client/tabBar/views/snippetMessage.js',
'client/page/stylesheets/snippetPage.css'
], 'client');

Expand Down