Merge 1279341 into d904e85

TAMULib · Aug 10, 2018 · 6ff0dee · 6ff0dee
2 parents d904e85 + 1279341
commit 6ff0dee
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/app/controllers/serviceController.js b/app/controllers/serviceController.js
@@ -1,4 +1,4 @@
-app.controller('ServiceController', function($controller, $route, $scope, ProjectService, Service, ServiceRepo, NgTableParams) {
+app.controller('ServiceController', function ($controller, $route, $scope, ProjectService, Service, ServiceRepo, NgTableParams) {
 
     angular.extend(this, $controller('AbstractScheduleController', {
         $scope: $scope
@@ -9,7 +9,7 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
         type: "service",
         options: ['UP', 'DOWN', 'MAINTENANCE']
     };
-    
+
     $scope.serviceRepo = ServiceRepo;
 
     $scope.services = $scope.serviceRepo.getAll();
@@ -39,13 +39,13 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
                 sortable: true
             },
             {
-                gloss: 'Public',
+                gloss: 'Visible to Anonymous Users',
                 property: 'isPublic',
                 filterable: true,
                 sortable: true
             },
             {
-                gloss: 'Short List',
+                gloss: 'Prominent Display',
                 property: 'onShortList',
                 filterable: true,
                 sortable: true
@@ -67,13 +67,13 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
         }]
     };
 
-    ProjectService.getAll().then(function(projects) {
+    ProjectService.getAll().then(function (projects) {
         $scope.projects = projects;
 
-        $scope.getProject = function(service) {
+        $scope.getProject = function (service) {
             if (service.projectId && !service.project) {
                 service.project = {};
-                ProjectService.getById(service.projectId).then(function(project) {
+                ProjectService.getById(service.projectId).then(function (project) {
                     angular.extend(service, {
                         project: project
                     });
@@ -85,7 +85,7 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
 
     });
 
-    $scope.resetServices = function() {
+    $scope.resetServices = function () {
         if ($scope.serviceData) {
             $scope.serviceData.refresh();
             $scope.serviceData.clearValidationResults();
@@ -108,54 +108,54 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
 
     $scope.resetServices();
 
-    $scope.createService = function() {
+    $scope.createService = function () {
         if ($scope.serviceData.isAuto) {
             $scope.serviceData.status = 'UP';
         } else {
             $scope.serviceData.isAuto = false;
         }
-        $scope.serviceRepo.create($scope.serviceData).then(function(res) {
+        $scope.serviceRepo.create($scope.serviceData).then(function (res) {
             if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
                 $scope.resetServices();
             }
         });
     };
 
-    $scope.editService = function(service) {
+    $scope.editService = function (service) {
         $scope.serviceData = service;
         $scope.openModal('#editServiceModal');
     };
 
-    $scope.updateService = function() {
-    	$scope.serviceRepo.update($scope.serviceData).then(function(res) {
+    $scope.updateService = function () {
+        $scope.serviceRepo.update($scope.serviceData).then(function (res) {
             if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
                 $scope.resetServices();
             }
         });
     };
 
-    $scope.editSchedule = function(service) {
+    $scope.editSchedule = function (service) {
         $scope.data = service;
         $scope.openModal('#editScheduleModal');
     };
 
-    $scope.resetSchedule = function() {
+    $scope.resetSchedule = function () {
         $scope.resetServices();
     };
 
-    ServiceRepo.ready().then(function() {
+    ServiceRepo.ready().then(function () {
         $scope.tableParams = ServiceRepo.getTableParams();
         $scope.resetServices();
     });
 
-    $scope.confirmDelete = function(service) {
+    $scope.confirmDelete = function (service) {
         $scope.openModal('#deleteServiceModal');
         $scope.serviceToDelete = service;
     };
 
-    $scope.deleteService = function() {
+    $scope.deleteService = function () {
         $scope.deleting = true;
-        $scope.serviceToDelete.delete().then(function() {
+        $scope.serviceToDelete.delete().then(function () {
             $scope.closeModal();
             $scope.deleting = false;
             ServiceRepo.remove($scope.serviceToDelete);
@@ -171,4 +171,4 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
         toolbar: "undo redo | formatselect bold italic separator | alignleft aligncenter alignright | bullist numlist | forecolor backcolor"
     };
 
-});
+});
diff --git a/app/views/management/services.html b/app/views/management/services.html
@@ -10,12 +10,15 @@
       <table ng-table="tableParams" template-header="customTableHeader" template-pagination="views/customPaginationControls.html" show-filter="false" class="table table-bordered table-striped service-table">
         <tbody>
           <tr ng-repeat="service in $data">
-            <td title="'Service'"><a href="{{'service/' + service.id + '/detail/'}}">{{service.name}}</a> <span ng-if="service.schedules.length > 0">(scheduled)</span></td>
+            <td title="'Service'">
+              <a href="{{'service/' + service.id + '/detail/'}}">{{service.name}}</a>
+              <span ng-if="service.schedules.length > 0">(scheduled)</span>
+            </td>
             <td title="'Status'">{{service.status}}</td>
             <td ng-if="service.isAuto" ng-attr-title="{{service.serviceUrl}}"><a href="{{service.serviceUrl}}">{{service.isAuto}}</a></td>
             <td ng-if="!service.isAuto" title="'Auto Updating'">{{service.isAuto}}</td>
-            <td title="'Public'">{{service.isPublic}}</td>
-            <td title="'Short List'">{{service.onShortList}}</td>
+            <td title="'Visible to Anonymous Users'">{{service.isPublic}}</td>
+            <td title="'Prominent Display'">{{service.onShortList}}</td>
             <td title="'Project'">{{getProject(service).name}}</td>
             <td class="actions-column text-center" title="'Actions'">
               <span class="glyphicon glyphicon-pencil" title="edit" ng-click="editService(service)"></span>
@@ -35,4 +38,4 @@
     </weaver-table-modals>
   </weaver-table>
 
-</div>
+</div>