Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9BE2A10BD4 for ; Sat, 5 Apr 2014 00:06:20 +0000 (UTC) Received: (qmail 86949 invoked by uid 500); 5 Apr 2014 00:05:40 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 86391 invoked by uid 500); 5 Apr 2014 00:05:25 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 86229 invoked by uid 99); 5 Apr 2014 00:05:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Apr 2014 00:05:21 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 05 Apr 2014 00:05:18 +0000 Received: (qmail 85398 invoked by uid 99); 5 Apr 2014 00:04:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Apr 2014 00:04:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 78E5C94376B; Sat, 5 Apr 2014 00:04:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mansu@apache.org To: commits@aurora.incubator.apache.org Date: Sat, 05 Apr 2014 00:05:22 -0000 Message-Id: In-Reply-To: <5fdaab79d57e42c185ff60c632bdc6f2@git.apache.org> References: <5fdaab79d57e42c185ff60c632bdc6f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] git commit: Self review. X-Virus-Checked: Checked by ClamAV on apache.org Self review. Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/7045f691 Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/7045f691 Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/7045f691 Branch: refs/heads/mansu/job_page Commit: 7045f6918297d9758521d7a637e1ea5a9124e9d7 Parents: c8f1897 Author: Suman Karumuri Authored: Sun Mar 30 22:04:39 2014 -0700 Committer: Suman Karumuri Committed: Sun Mar 30 22:30:40 2014 -0700 ---------------------------------------------------------------------- .../resources/org/apache/aurora/scheduler/http/ui/job.html | 4 ++-- .../org/apache/aurora/scheduler/http/ui/js/controllers.js | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7045f691/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html index e8ea278..e515b51 100644 --- a/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html +++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/job.html @@ -1,9 +1,9 @@
-
+
-
+
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/7045f691/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js index 3318b4c..62206c5 100644 --- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js +++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js @@ -22,7 +22,7 @@ auroraUIControllers.controller('RoleSummaryController', function ($scope, auroraClient) { $scope.title = 'Scheduled Jobs Summary'; - $scope.error = false; + $scope.error = ''; $scope.roleSummaryColumns = [ {label: 'Role', map: 'role', cellTemplateUrl: 'roleLink.html'}, @@ -60,7 +60,7 @@ auroraUIControllers.controller('JobSummaryController', $scope.role = $routeParams.role; $scope.environment = $routeParams.environment; - $scope.error = false; + $scope.error = ''; var showResourcesMsg = 'Show Resource Consumption'; var hideResourcesMsg = 'Hide Resource Consumption'; @@ -216,7 +216,7 @@ auroraUIControllers.controller('JobSummaryController', auroraUIControllers.controller('QuotaController', function ($scope, $filter, auroraClient) { - $scope.error = false; + $scope.error = ''; $scope.resourcesTableColumns = [ {label: 'Resource', map: 'resource'}, @@ -264,8 +264,7 @@ auroraUIControllers.controller('QuotaController', auroraUIControllers.controller('JobController', function ($scope, $routeParams, auroraClient) { - $scope.error = false; - $scope.errorMsg = ''; + $scope.error = ''; $scope.role = $routeParams.role; $scope.environment = $routeParams.environment;