You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/09/01 14:25:33 UTC
svn commit: r1621760 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
js/app/controllers/controllers-status.js js/app/services/services.js
partials/status.html
Author: olamy
Date: Mon Sep 1 12:25:32 2014
New Revision: 1621760
URL: http://svn.apache.org/r1621760
Log:
fix services
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js?rev=1621760&r1=1621759&r2=1621760&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js Mon Sep 1 12:25:32 2014
@@ -22,15 +22,15 @@ define(['jquery','angular','bootstrap','
var statusControllers = angular.module('statusControllers', ['sironaServices','ui.bootstrap']);
- statusControllers.controller( 'StatusHomeCtrl', ['$scope','$routeParams','status',
+ statusControllers.controller( 'StatusHomeCtrl', ['$scope','status',
function ($scope,status){
$scope.data={};
console.log("StatusHomeCtrl");
- status.get().$promise.then( function ( results ){
-
+ status.all().$promise.then( function ( results ){
+ $scope.data.applicationStatuseses=results;
});
}]);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js?rev=1621760&r1=1621759&r2=1621760&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js Mon Sep 1 12:25:32 2014
@@ -106,7 +106,10 @@ define(['angular','angular-resource'], f
function($resource){
return $resource('restServices/sironaServices/status/:nodeName',
{},
- {query: {method:'GET', params:{nodeName:'@nodeName'},isArray:false}});
+ {
+ query: {method:'GET', params:{nodeName:'@nodeName'},isArray:false},
+ all: {method:'GET', params:{},isArray:true}
+ });
}
]);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html?rev=1621760&r1=1621759&r2=1621760&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html Mon Sep 1 12:25:32 2014
@@ -16,6 +16,10 @@
-->
<div class="row">
<div class="col-lg-12">
- status
+ <ul>
+ <li ng-repeat="applicationStatuses in data.applicationStatuseses">
+ <a href="#status/{{::applicationStatuses.name}}">{{::applicationStatuses.name}}</a>
+ </li>
+ </ul>
</div>
</div>
\ No newline at end of file