From 7b9db1a5b51018300fbffe828c455e748a1ea940 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Mon, 27 May 2019 11:07:53 -0700 Subject: [PATCH] Fixed device tagging rights. --- package.json | 2 +- views/default-min.handlebars | 2 +- views/default-mobile-min.handlebars | 2 +- views/default-mobile.handlebars | 6 +++++- views/default.handlebars | 6 +++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6d6cee2f..47e1618b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.5-f", + "version": "0.3.5-g", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 1f950ab7..204f4340 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default-mobile-min.handlebars b/views/default-mobile-min.handlebars index cfb6c893..a430e7f5 100644 --- a/views/default-mobile-min.handlebars +++ b/views/default-mobile-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}
\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}
\ No newline at end of file diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index bcde02d3..066cf7f3 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -1829,7 +1829,11 @@ // Node tags var groupingTags = 'None'; if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '' + node.tags[i] + ''; } } - x += addDeviceAttribute('Tags', '' + groupingTags + ''); + if ((meshrights & 4) != 0) { + x += addDeviceAttribute('Tags', '' + groupingTags + ''); + } else { + x += addDeviceAttribute('Tags', groupingTags); + } x += '
'; // Show action button, only show if we have permissions 4, 8, 64 diff --git a/views/default.handlebars b/views/default.handlebars index 2c5c24fd..5d7d12e3 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -3795,7 +3795,11 @@ // Node grouping tags var groupingTags = 'None'; if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '' + node.tags[i] + ''; } } - x += addDeviceAttribute('Tags', '' + groupingTags + ' '); + if ((meshrights & 4) != 0) { + x += addDeviceAttribute('Tags', '' + groupingTags + ' '); + } else { + x += addDeviceAttribute('Tags', groupingTags); + } x += '
'; // Show action button, only show if we have permissions 4, 8, 64