Merge pull request #8937 from RocketChat/snippetted-messages

[FIX] Snippetted messages not working
RocketChat · Dec 8, 2017 · 4ba0170 · 4ba0170
2 parents 73e4cc7 + fe24591
commit 4ba0170
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 94 deletions.
diff --git a/packages/rocketchat-message-snippet/client/actionButton.js b/packages/rocketchat-message-snippet/client/actionButton.js
@@ -8,6 +8,8 @@ Meteor.startup(function() {
 			'message',
 			'message-mobile'
 		],
+		order: 10,
+		group: 'menu',
 		action() {
 			const message = this._arguments[1];
 
@@ -48,7 +50,7 @@ Meteor.startup(function() {
 				return false;
 			}
 
-			RocketChat.authz.hasAtLeastOnePermission('snippet-message', message.rid);
+			return RocketChat.authz.hasAtLeastOnePermission('snippet-message', message.rid);
 		}
 	});
 });
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html
@@ -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>
@@ -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>
diff --git a/packages/rocketchat-message-snippet/package.js b/packages/rocketchat-message-snippet/package.js
@@ -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');