Merge pull request #2231 from subutai-io/base-2223

#2223
subutai-io · Jan 31, 2018 · 2c511bc · 2c511bc
2 parents 8e92a3a + fc451a7
commit 2c511bc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/...mand-executor-rest-ui/src/main/java/io/subutai/core/executor/rest/ui/RestServiceImpl.java b/...mand-executor-rest-ui/src/main/java/io/subutai/core/executor/rest/ui/RestServiceImpl.java
@@ -102,13 +102,6 @@ public Response executeCommand( final String hostId, final String command, Strin
                 {
                     throw new AccessControlException( "Access denied" );
                 }
-                catch ( Exception e )
-                {
-                    LOG.error( "Error executing command", e );
-
-                    return Response.status( Response.Status.INTERNAL_SERVER_ERROR )
-                                   .entity( JsonUtil.toJson( e.getMessage() ) ).build();
-                }
             }
             // this command is intended to run on RH
             else

diff --git a/management/server/webui/src/main/webapp/subutai-app/console/partials/view.html b/management/server/webui/src/main/webapp/subutai-app/console/partials/view.html
@@ -75,18 +75,6 @@
 			</div>
 
 			<div class="b-toggle-buttons">
-				<!--<ul>
-					<li class="b-toggle-buttons__item" 
-					ng-class="consoleViewCtrl.currentType == 'peer' ? 'b-toggle-buttons__item_active' : ''" 
-					ng-click="consoleViewCtrl.setCurrentType('peer')">
-						Peer
-					</li>
-					<li class="b-toggle-buttons__item"
-					ng-class="consoleViewCtrl.currentType == 'environments' ? 'b-toggle-buttons__item_active' : ''" 
-					ng-click="consoleViewCtrl.setCurrentType('environments')">
-						Environment
-					</li>
-				</ul>-->
 
 				<div class="b-main-form__wrapper b-main-form__wrapper_min">
 					<label class="b-popup-body-label b-popup-body-label_inline">