You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/22 18:23:33 UTC
[62/65] [abbrv] git commit: add expected count to history
add expected count to history
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/eccd2e6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/eccd2e6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/eccd2e6f
Branch: refs/heads/two-dot-o
Commit: eccd2e6f7f987a3d72499e1cb22364bd950f09e8
Parents: 6ab2a00
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 21 14:51:01 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 21 14:51:01 2014 -0600
----------------------------------------------------------------------
portal/js/global/ug-service.js | 2 +-
portal/js/push/push-history.html | 8 ++++----
portal/js/push/push-send-notification-controller.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/eccd2e6f/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index 0f671ff..3401060 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -1370,4 +1370,4 @@ AppServices.Services.factory('ug', function(configuration, $rootScope, utility,
}
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/eccd2e6f/portal/js/push/push-history.html
----------------------------------------------------------------------
diff --git a/portal/js/push/push-history.html b/portal/js/push/push-history.html
index 46ff212..1896914 100644
--- a/portal/js/push/push-history.html
+++ b/portal/js/push/push-history.html
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,9 +46,9 @@
<img ng-src="{{getStateImage(notification)}}" style="vertical-align:middle;margin-top: -3px;"> {{getStateMessage(notification)}}
</div>
</div>
- <div style="float: right; text-align: right;">
+ <div style="float: right; text-align: right;" title="you must send debug=true in message">
<a href="" class="notifications-links" ng-click="viewReceipts(notification._data.uuid)">view details</a>
- <br>Total Sent: {{notification._data.statistics.sent ? notification._data.statistics.sent : 0}} Total Errors: {{notification._data.statistics.errors ? notification._data.statistics.errors : 0}}
+ <br>Total Expected: {{notification._data.expectedCount}}, Total Sent: {{notification._data.statistics.sent ? notification._data.statistics.sent : 0}}, Total Errors: {{notification._data.statistics.errors ? notification._data.statistics.errors : 0}}
<br>
<b>UUID</b>:
<a href="" ng-click="viewReceipts('{{notification._data.uuid}}')">{{notification._data.uuid}}</a>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/eccd2e6f/portal/js/push/push-send-notification-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/push/push-send-notification-controller.js b/portal/js/push/push-send-notification-controller.js
index 7037323..a144e5e 100644
--- a/portal/js/push/push-send-notification-controller.js
+++ b/portal/js/push/push-send-notification-controller.js
@@ -106,4 +106,4 @@ AppServices.Controllers.controller('PushSendNotificationCtrl', ['ug', '$scope',
$('#gmt_display').html('GMT ' + offset);
}
-]);
\ No newline at end of file
+]);