diff --git a/README.md b/README.md index cfb891a6..bf2b9527 100755 --- a/README.md +++ b/README.md @@ -52,10 +52,6 @@ Notes: 4. Push to the branch: `git push origin my-new-feature` 5. Submit a pull request -## Author(s) - -Neal Conrad - ## License diff --git a/app/ctrls/ms-ctrls.js b/app/ctrls/ms-ctrls.js index 34d04017..b5eeedf7 100755 --- a/app/ctrls/ms-ctrls.js +++ b/app/ctrls/ms-ctrls.js @@ -18,6 +18,7 @@ function($scope, $state, $stateParams, Auth, $window) { // sets method and changes url param $scope.switchMethod = function(method) { $scope.method = Auth.loginMethod(method); + $scope.inValid = false; //$state.go('main.home', {login: method}); } @@ -141,7 +142,7 @@ function($s, $http, config, $rootScope) { .then(function(res) { $s.app = true; }) .catch(function() { $s.app = false; }) - $http.rpc('msSupport', 'list_rast_jobs', {owner: $rootScope.user}) + $http.rpc('msSupport', 'version', {owner: $rootScope.user}) .then(function(res) { console.log('res', res); $s.msSupport = true; }) diff --git a/app/services/auth.js b/app/services/auth.js index 45b850f0..7c5ab914 100644 --- a/app/services/auth.js +++ b/app/services/auth.js @@ -88,10 +88,14 @@ function($state, $http, config, $window) { this.logout = function() { $window.localStorage.removeItem('auth'); - $state.transitionTo('main.home', {}, { reload: true, inherit: true, notify: false }) - .then(function() { - $window.location.reload(); - }); + + var to_url = window.location.protocol + '//' + window.location.host; + if ($state.current.name === 'main.home') { + $window.location.reload(); + } else { + to_url = to_url + '/genomes/Plants'; + $window.location.replace(to_url); + } } this.isAuthenticated = function() { diff --git a/app/services/dialogs.js b/app/services/dialogs.js index 4416e949..4fbc2ab3 100644 --- a/app/services/dialogs.js +++ b/app/services/dialogs.js @@ -789,7 +789,6 @@ function($rootScope, $dialog, $window, $timeout, Auth, $stateParams) { $s.method = Auth.loginMethod(method); $stateParams.login = method; $s.inValid = false; - $s.creds = {}; } $s.ok = function(){ diff --git a/app/views/data/model.html b/app/views/data/model.html index 0bcd7fb4..cafa3204 100755 --- a/app/views/data/model.html +++ b/app/views/data/model.html @@ -16,10 +16,6 @@ Run FBA Run GapFilling - - View download options - - diff --git a/app/views/dialogs/auth.html b/app/views/dialogs/auth.html index 89529077..2bf35dcb 100644 --- a/app/views/dialogs/auth.html +++ b/app/views/dialogs/auth.html @@ -5,7 +5,7 @@

Please sign in

- close + close diff --git a/app/views/docs/sources.html b/app/views/docs/sources.html index f7f331ff..e371e4bb 100644 --- a/app/views/docs/sources.html +++ b/app/views/docs/sources.html @@ -17,25 +17,30 @@

Data Sources

- Biochemical data and metabolic maps + Biochemical data (DOI) and metabolic maps - Kyoto Encyclopedia for Genes and Genomes
- MetaCyc
- PlantCyc + KEGG, + MetaCyc, + PlantCyc, + Rhea Genome annotations and subsystem data - SEED/RAST/MGRAST + + SEED, + RAST, + MGRAST + Plant Genomes - JGI Phytozome + JGI Phytozome Plant Gene Atlas
- With thanks to Avinash Sreedasyam of HudsonAlpha - JGI Gene Atlas + With thanks to Avinash Sreedasyam of HudsonAlpha + JGI Gene Atlas diff --git a/app/views/home.html b/app/views/home.html index 2f96032e..3d3fed11 100755 --- a/app/views/home.html +++ b/app/views/home.html @@ -8,7 +8,18 @@
Metabolic Modeling Made Simple.
- + + Biochemistry
(No login required)
+