------------------------------------------------------------ revno: 21776 committer: jijukjose <jijukj...@gmail.com> branch nick: dhis2 timestamp: Mon 2016-01-18 11:41:47 +0100 message: Fixed the error message that is displayed when audit history is not available. modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_in_ID.properties dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2016-01-15 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2016-01-18 10:41:47 +0000 @@ -160,5 +160,5 @@ audit_value=Value audit_type=Audit Type audit_modified=Modified By -audit_history_unavailable=audit history is not available +audit_history_unavailable=There are no previous values stored, so audit history is not available for audit_history=Audit History \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2016-01-15 00:39:39 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2016-01-18 10:41:47 +0000 @@ -407,6 +407,6 @@ audit_value=Value audit_type=Audit Type audit_modified=Modified By -audit_history_unavailable=audit history is not available +audit_history_unavailable=There are no previous values stored, so audit history is not available for delete_error_audit=The event could not be deleted because it contains an auditlog. are_you_sure_to_remove=Are you sure you want to remove? \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_in_ID.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_in_ID.properties 2016-01-16 15:13:46 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_in_ID.properties 2016-01-18 10:41:47 +0000 @@ -407,6 +407,6 @@ audit_value=Value audit_type=Audit Type audit_modified=Modified By -audit_history_unavailable=audit history is not available +audit_history_unavailable=There are no previous values stored, so audit history is not available for delete_error_audit=The event could not be deleted because it contains an auditlog. are_you_sure_to_remove=Are you sure you want to remove? === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html 2016-01-13 14:14:45 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/audit-history.html 2016-01-18 10:41:47 +0000 @@ -35,7 +35,7 @@ </div> <div ng-if="itemList.length === 0"> <div class="modal-body"> - <h3> {{trackedEntity}} {{'audit_history_unavailable'| translate}} </h3> + <h3> {{'audit_history_unavailable'| translate}} {{trackedEntity}} </h3> <button type="button" class="btn btn-default" data-ng-click="close()">{{'close'| translate}}</button> </div> </div> === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js 2016-01-15 16:59:37 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js 2016-01-18 10:41:47 +0000 @@ -424,9 +424,6 @@ return $scope.type; }, currentEvent: function() { - if($scope.currentEvent === "SINGLE_EVENT") { - alert("Single Event !!!"); - } return $scope.currentEvent; }, selectedTeiId: function() {
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp