fix conflicts

soprasteria · Feb 12, 2018 · 3c80fff · 3c80fff
1 parent 0489d0f
commit 3c80fff
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/public/modules/groups/controllers/groups.client.controller.js b/public/modules/groups/controllers/groups.client.controller.js
@@ -631,7 +631,6 @@ angular.module('groups').controller('GroupsController', ['$scope', '$stateParams
 
 
  $scope.generateCommand = function(container) {
- console.log(container);
  if (!container) {
  return '';
  }

diff --git a/public/modules/groups/views/view-container.client.view.html b/public/modules/groups/views/view-container.client.view.html
@@ -147,7 +147,7 @@ <h4>Commands</h4>
  <i class="fa fa-exclamation-triangle"></i>
  </md-button>
  </div>
- <pre>{{ generateCommand(container) }}</pre>
+ <pre ng-if="authentication.isAdmin">{{generateCommand(container)}}</pre>
 
  <div ng-show="container.daemon.dockerStatusUp">