safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-807 Fixed login page error, minify button usage, and menu initial state.

Browse Source
This commit is contained in:
James Muehlner
2014-11-05 22:41:46 -08:00
parent fa68aa7d80
commit 4c34220c65
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/pom.xml
View File

@@ -90,9 +90,6 @@
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>
<phase>process-resources</phase> <phase>process-resources</phase>
<configuration>
<webappDirectory>${project.build.directory}/minify</webappDirectory>
</configuration>
<goals> <goals>
<goal>exploded</goal> <goal>exploded</goal>
</goals> </goals>
@@ -111,7 +108,7 @@
<configuration> <configuration>
<charset>UTF-8</charset> <charset>UTF-8</charset>
<webappSourceDir>${project.build.directory}/minify</webappSourceDir> <webappSourceDir>${project.build.directory}/${project.build.finalName}</webappSourceDir>
<cssSourceDir>/</cssSourceDir> <cssSourceDir>/</cssSourceDir>
<cssTargetDir>/</cssTargetDir> <cssTargetDir>/</cssTargetDir>

2
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -44,7 +44,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
$scope.clientProperties = {scale: 1}; $scope.clientProperties = {scale: 1};
// Hide menu by default // Hide menu by default
$scope.menuShown = true; $scope.menuShown = false;
/* /*
* Parse the type, name, and id out of the url paramteres, * Parse the type, name, and id out of the url paramteres,

2
guacamole/src/main/webapp/app/index/services/authenticationInterceptor.js
View File

@@ -31,7 +31,7 @@ angular.module('index').factory('authenticationInterceptor', ['$location', '$q',
'responseError': function(rejection) { 'responseError': function(rejection) {
// Do not redirect failed login requests to the login page. // Do not redirect failed login requests to the login page.
if ((rejection.status === 401 || rejection.status === 403) if ((rejection.status === 401 || rejection.status === 403)
&& rejection.config.url.search('api/login') === -1) { && rejection.config.url.search('api/token') === -1) {
$location.path('/login'); $location.path('/login');
} }
return $q.reject(rejection); return $q.reject(rejection);