From 8567bb4617bcb1c1a6c84beca866dd0c8265265b Mon Sep 17 00:00:00 2001 From: OldHawk Date: Tue, 13 Jun 2017 09:42:07 +0800 Subject: [PATCH] fix(users): first sign in, level show error --- modules/core/client/controllers/header.client.controller.js | 2 +- modules/core/client/directives/score-level.client.directive.js | 2 +- modules/core/client/less/mt.less | 2 +- .../users/client/controllers/score/score.client.controller.js | 2 +- modules/users/client/templates/how-level-en.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index aafbdd63..f118f622 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -21,7 +21,7 @@ vm.authentication = Authentication; vm.isCollapsed = false; vm.menu = menuService.getMenu('topbar'); - vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score); + vm.scoreLevelData = vm.user ? ScoreLevelService.getScoreLevelJson(vm.user.score) : undefined; $scope.$on('$stateChangeSuccess', stateChangeSuccess); diff --git a/modules/core/client/directives/score-level.client.directive.js b/modules/core/client/directives/score-level.client.directive.js index 7a72bedb..64443bae 100644 --- a/modules/core/client/directives/score-level.client.directive.js +++ b/modules/core/client/directives/score-level.client.directive.js @@ -15,7 +15,7 @@ function link(scope, element, attrs) { scope.$watch(attrs.scoreLevel, function (level) { - var l = 'L' + level; + var l = 'L' + (level ? level : 0); l = '' + l + ''; element.addClass('score-level'); diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 1838d669..e5cd6ed4 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -179,7 +179,7 @@ body { .menu-score { position: absolute; - right: 20px; + right: 10px; top: 3px; } diff --git a/modules/users/client/controllers/score/score.client.controller.js b/modules/users/client/controllers/score/score.client.controller.js index 6f91d46a..659d6fc1 100644 --- a/modules/users/client/controllers/score/score.client.controller.js +++ b/modules/users/client/controllers/score/score.client.controller.js @@ -6,7 +6,7 @@ .controller('ScoreController', ScoreController); ScoreController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', '$window', 'ScoreLevelService', 'getStorageLangService', - 'MeanTorrentConfig']; + 'MeanTorrentConfig']; function ScoreController($scope, $state, $translate, $timeout, Authentication, $window, ScoreLevelService, getStorageLangService, MeanTorrentConfig) { var vm = this; diff --git a/modules/users/client/templates/how-level-en.md b/modules/users/client/templates/how-level-en.md index 0d5bc53d..5ed6a101 100644 --- a/modules/users/client/templates/how-level-en.md +++ b/modules/users/client/templates/how-level-en.md @@ -1,6 +1,6 @@ 1. User score level calculation formula is: `sqrt(score number / 500)`. 1. Level`1` score is: `500`. -1. Level`2` score is: `200`. +1. Level`2` score is: `2000`. 1. Level`3` score is: `4500`. 1. Level`4` score is: `8000`. 1. Level`x` score is: `x * x * 500`.