[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18895: ouwt: support db translation, adds i18nService.internationalise to GetOrgUnitTreeAction
revno: 18895
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-04-14 15:13:01 +0700
message:
ouwt: support db translation, adds i18nService.internationalise to
GetOrgUnitTreeAction
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTree.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTreePartial.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
--
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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTree.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTree.vm 2014-06-30 05:19:24 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTree.vm 2015-04-14 08:13:01 +
@@ -6,7 +6,8 @@
#if( ! $versionOnly )
,organisationUnits: {
#foreach( $unit in $organisationUnits )
-$!encoder.jsonEncode($unit.uid):{id:$!encoder.jsonEncode($unit.uid),n:$!encoder.jsonEncode( ${unit.name} ),l:${unit.level},#if( $unit.parent )pid:$!encoder.jsonEncode($unit.parent.uid),#endc:[#foreach( $child in $unit.sortedChildren )$!encoder.jsonEncode($child.uid)#if( $velocityCount $unit.children.size() ),#end#end]}
+$!encoder.jsonEncode($unit.uid):{id:$!encoder.jsonEncode($unit.uid),n:$!encoder.jsonEncode( ${unit.displayName} ),l:${unit.level},#if( $unit.parent )pid:$!encoder.jsonEncode($unit.parent.uid),#endc:[#foreach( $child in $unit.sortedChildren )
+$!encoder.jsonEncode($child.uid)#if( $velocityCount $unit.children.size() ),#end#end]}
#if( $velocityCount $organisationUnits.size() ),#end#end
}#end
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTreePartial.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTreePartial.vm 2015-01-08 10:24:18 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTreePartial.vm 2015-04-14 08:13:01 +
@@ -4,6 +4,7 @@
,roots: [ #foreach( $root in $rootOrganisationUnits )$!encoder.jsonEncode($root.uid)#if( $velocityCount $rootOrganisationUnits.size() ),#end#end ]
,organisationUnits: {
#foreach( $unit in $organisationUnits )
-$!encoder.jsonEncode($unit.uid):{id:$!encoder.jsonEncode($unit.uid),n:$!encoder.jsonEncode( ${unit.name} ),#if( $unit.parent )pid:$!encoder.jsonEncode($unit.parent.uid),#endc:[#foreach( $child in $unit.sortedChildren )$!encoder.jsonEncode($child.uid)#if( $velocityCount $unit.children.size() ),#end#end]}
+$!encoder.jsonEncode($unit.uid):{id:$!encoder.jsonEncode($unit.uid),n:$!encoder.jsonEncode( ${unit.displayName} ),#if( $unit.parent )pid:$!encoder.jsonEncode($unit.parent.uid),#endc:[#foreach( $child in $unit.sortedChildren )$!encoder
+.jsonEncode($child.uid)#if( $velocityCount $unit.children.size() ),#end#end]}
#if( $velocityCount $organisationUnits.size() ),#end#end
}}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java 2015-04-10 06:41:31 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java 2015-04-14 08:13:01 +
@@ -30,6 +30,7 @@
import com.opensymphony.xwork2.Action;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.i18n.I18nService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -37,6 +38,7 @@
import org.hisp.dhis.user.User;
import org.hisp.dhis.version.Version;
import org.hisp.dhis.version.VersionService;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.Collection;
@@ -54,26 +56,17 @@
// Dependencies
// -
+@Autowired
private CurrentUserService currentUserService;
-public void setCurrentUserService( CurrentUserService currentUserService )
-{
-this.currentUserService = currentUserService;
-}
-
+@Autowired
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18896: support i18n db translation in selected/available widget
revno: 18896
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-04-14 15:25:33 +0700
message:
support i18n db translation in selected/available widget
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js 2015-03-25 14:59:23 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js 2015-04-14 08:25:33 +
@@ -107,7 +107,7 @@
$.fn.selected.defaults = {
iterator: 'objects',
handler: function( item ) {
- return $('option/').val(item.id).text(item.name);
+ return $('option/').val(item.id).text(item.displayName);
},
defaultMoveSelected: function( sel ) {
$(sel).find(':selected').trigger('dblclick');
@@ -165,7 +165,9 @@
data: {
paging: true,
pageSize: 100 + context.target.children().length,
- page: context.page
+ page: context.page,
+ translate: true,
+ fields: 'id,displayName'
},
dataType: 'json'
};
@@ -218,7 +220,9 @@
var request = {
url: context.url,
data: {
- paging: false
+ paging: false,
+ translate: true,
+ fields: 'id,displayName'
},
dataType: 'json'
};
___
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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18897: Resolve script error that tried to attach an event to a form element that did not exist when sett...
revno: 18897
committer: Mark Polak mar...@ifi.uio.no
branch nick: dhis2
timestamp: Tue 2015-04-14 11:21:56 +0200
message:
Resolve script error that tried to attach an event to a form element that did
not exist when settings are not available
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.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-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js 2013-11-04 20:56:04 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js 2015-04-14 09:21:56 +
@@ -1,5 +1,11 @@
-function autoUpload() {
-document.getElementById('uploadPackageForm').addEventListener('change', function(e) {
+/* global jQuery */
+jQuery(function autoUpload() {
+var uploadForm = document.getElementById('uploadPackageForm')
+
+//If settings are not valid the form is not available.
+if (uploadForm === null) { return; }
+
+uploadForm.addEventListener('change', function(e) {
var fd = new FormData(document.getElementById('uploadPackageForm'));
var xhr = new XMLHttpRequest();
xhr.addEventListener('progress', function(e) {
@@ -31,6 +37,4 @@
xhr.open('post', 'addApp.action', true);
xhr.send(fd);
}, false);
-}
-
-$( document ).ready( autoUpload );
\ No newline at end of file
+});
___
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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18899: tracker-capture: sorting TEI list in relationship
revno: 18899
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-04-14 14:20:55 +0200
message:
tracker-capture: sorting TEI list in relationship
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.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-tracker-capture/components/relationship/relationship-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2015-04-09 13:20:27 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2015-04-14 12:20:55 +
@@ -171,6 +171,7 @@
.controller('AddRelationshipController',
function($scope,
$rootScope,
+DateUtils,
CurrentSelection,
OperatorFactory,
AttributesFactory,
@@ -264,6 +265,7 @@
$scope.queryUrl = null;
$scope.programUrl = null;
$scope.attributeUrl = {url: null, hasValue: false};
+$scope.sortColumn = {};
}
//listen for selections
@@ -272,6 +274,29 @@
$scope.teiForRelationship = relationshipInfo.tei;
});
+//sortGrid
+$scope.sortGrid = function(gridHeader){
+if ($scope.sortColumn $scope.sortColumn.id === gridHeader.id){
+$scope.reverse = !$scope.reverse;
+return;
+}
+$scope.sortColumn = gridHeader;
+if($scope.sortColumn.valueType === 'date'){
+$scope.reverse = true;
+}
+else{
+$scope.reverse = false;
+}
+};
+
+$scope.d2Sort = function(tei){
+if($scope.sortColumn $scope.sortColumn.valueType === 'date'){
+var d = tei[$scope.sortColumn.id];
+return DateUtils.getDate(d);
+}
+return tei[$scope.sortColumn.id];
+};
+
$scope.search = function(mode){
resetFields();
@@ -338,7 +363,12 @@
//process tei grid
$scope.trackedEntityList = TEIGridService.format(data,false, $scope.optionSets);
$scope.showTrackedEntityDiv = true;
-$scope.teiFetched = true;
+$scope.teiFetched = true;
+
+if(!$scope.sortColumn.id){
+$scope.sortGrid({id: 'created', name: $translate('registration_date'), valueType: 'date', displayInListNoProgram: false, showFilter: false, show: false});
+}
+
});
};
___
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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18898: minor
revno: 18898
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Tue 2015-04-14 11:56:06 +0200
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html
--
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-tracker-capture/components/dashboard/dashboard.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2015-03-30 15:57:15 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2015-04-14 09:56:06 +
@@ -3,9 +3,9 @@
button type=button class=btn btn-default ng-click=back(){{'back'| translate}}/button
-button ng-disabled=!previousTeiExists type=button class=btn btn-default small-horizonal-spacing ng-click=fetchTei('PREV') title={{'prv_rcrd'| translate}}i class=fa fa-caret-left/i/button
+button ng-disabled=!previousTeiExists type=button class=btn btn-default small-horizonal-spacing ng-click=fetchTei('PREV') title={{'previous'| translate}}i class=fa fa-caret-left/i/button
-button ng-disabled=!nextTeiExists type=button class=btn btn-default small-horizonal-spacing ng-click=fetchTei('NEXT') title={{'nxt_rcrd'| translate}}i class=fa fa-caret-right/i/button
+button ng-disabled=!nextTeiExists type=button class=btn btn-default small-horizonal-spacing ng-click=fetchTei('NEXT') title={{'next'| translate}}i class=fa fa-caret-right/i/button
select ng-model=selectedProgram
class=form-control-program
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2015-04-09 12:36:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2015-04-14 09:56:06 +
@@ -27,7 +27,7 @@
/tr
/thead
tbody id=list
-tr ng-repeat=trackedEntity in trackedEntityList.rows
+tr ng-repeat=trackedEntity in trackedEntityList.rows| orderBy:d2Sort:reverse
ng-click=selectedTei.trackedEntityInstance ? assignRelationship(trackedEntity) : showDashboard(trackedEntity)
ng-if=selectedTei.trackedEntityInstance ? trackedEntity.id !== selectedTei.trackedEntityInstance : true
title={{selectedTei.trackedEntityInstance ? 'select' : 'go_to_dashboard'| translate}}
___
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
Re: [Dhis2-devs] Timestamps on metadata export
Sorry. Please larglely ignore the last message. It looks like decimal seconds are indeed valid. (just that not every validator knows this) But can someone still confirm that is indeed a xsd:dateTime. Cheers, -carl On Tue, Apr 14, 2015 at 12:28 PM, Carl Leitner litlf...@ibiblio.org wrote: Hi All, In the dxf metadata export there are @lastUpdated and @created attributes. What is the format for these attributes? I assumed that they were xsd:dateTime's or something. Looking at an example: document name=Central Level EPI Harmonization created=2013-06-25T16:45:13.000+ lastUpdated=2012-08-23T14:01:36.868+ id=xCcasyVyLF8 The time looks like 2012-08-23T14:01:36.868+ which has a decimal compoenent to the second. If I understand correctly, this is not a valid xsd:dateTIme: http://www.w3.org/TR/xmlschema11-2/#dateTime Can someone clarify this for me? Thanks! Cheers, -carl ___ 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
[Dhis2-devs] Timestamps on metadata export
Hi All, In the dxf metadata export there are @lastUpdated and @created attributes. What is the format for these attributes? I assumed that they were xsd:dateTime's or something. Looking at an example: document name=Central Level EPI Harmonization created=2013-06-25T16:45:13.000+ lastUpdated=2012-08-23T14:01:36.868+ id=xCcasyVyLF8 The time looks like 2012-08-23T14:01:36.868+ which has a decimal compoenent to the second. If I understand correctly, this is not a valid xsd:dateTIme: http://www.w3.org/TR/xmlschema11-2/#dateTime Can someone clarify this for me? Thanks! Cheers, -carl ___ 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18901: make it more obvious that metadata is true by default in Schema
revno: 18901 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Wed 2015-04-15 09:30:33 +0700 message: make it more obvious that metadata is true by default in Schema modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java -- 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-api/src/main/java/org/hisp/dhis/schema/Schema.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2015-04-15 02:25:49 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2015-04-15 02:30:33 + @@ -116,7 +116,7 @@ /** * Is this class considered metadata, this is mainly used for our metadata importer/exporter. */ -private boolean metadata; +private boolean metadata = true; /** * Are any properties on this class being persisted, if false, this file does not have any hbm file attached to it. @@ -148,7 +148,6 @@ this.nameableObject = NameableObject.class.isAssignableFrom( klass ); this.singular = singular; this.plural = plural; -this.metadata = true; } @Override ___ 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
Re: [Dhis2-devs] Bug on OpenID dhis2
Which version of dhis2? -- Morten 2015-04-15 8:21 GMT+07:00 Ngoc Thanh Nguyen thanh.hispviet...@gmail.com: After signing in successfully Etat HTTP 500 - Filter execution threw an exception -- *type* Rapport d''exception *message* *Filter execution threw an exception* *description* *Le serveur a rencontré une erreur interne qui l''a empêché de satisfaire la requête.* *exception* javax.servlet.ServletException: Filter execution threw an exception org.springframework.orm.hibernate4.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:150) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) *cause mère* java.lang.NoClassDefFoundError: org/openid4java/util/OpenID4JavaDOMParser org.openid4java.discovery.yadis.CyberNekoDOMYadisHtmlParser.parseDocument(CyberNekoDOMYadisHtmlParser.java:96) org.openid4java.discovery.yadis.CyberNekoDOMYadisHtmlParser.getHtmlMeta(CyberNekoDOMYadisHtmlParser.java:39) org.openid4java.discovery.yadis.YadisResolver.getHtmlMeta(YadisResolver.java:325) org.openid4java.discovery.yadis.YadisResolver.retrieveXrdsLocation(YadisResolver.java:453) org.openid4java.discovery.yadis.YadisResolver.discover(YadisResolver.java:252) org.openid4java.discovery.yadis.YadisResolver.discover(YadisResolver.java:232) org.openid4java.discovery.yadis.YadisResolver.discover(YadisResolver.java:166) org.openid4java.discovery.Discovery.discover(Discovery.java:147) org.openid4java.consumer.ConsumerManager.verifyDiscovered2(ConsumerManager.java:1693) org.openid4java.consumer.ConsumerManager.verifyDiscovered(ConsumerManager.java:1521) org.openid4java.consumer.ConsumerManager.verify(ConsumerManager.java:1156) org.springframework.security.openid.OpenID4JavaConsumer.endConsumption(OpenID4JavaConsumer.java:169) org.springframework.security.openid.OpenIDAuthenticationFilter.attemptAuthentication(OpenIDAuthenticationFilter.java:145) org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:211) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.hisp.dhis.security.filter.CustomAuthenticationFilter.doFilter(CustomAuthenticationFilter.java:64) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.hisp.dhis.security.filter.AutomaticAccessFilter.doFilter(AutomaticAccessFilter.java:115) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:57) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:50) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:344) org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:261) org.springframework.orm.hibernate4.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:150)
[Dhis2-devs] Bug on OpenID dhis2
After signing in successfully Etat HTTP 500 - Filter execution threw an exception -- *type* Rapport d''exception *message* *Filter execution threw an exception* *description* *Le serveur a rencontré une erreur interne qui l''a empêché de satisfaire la requête.* *exception* javax.servlet.ServletException: Filter execution threw an exception org.springframework.orm.hibernate4.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:150) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) *cause mère* java.lang.NoClassDefFoundError: org/openid4java/util/OpenID4JavaDOMParser org.openid4java.discovery.yadis.CyberNekoDOMYadisHtmlParser.parseDocument(CyberNekoDOMYadisHtmlParser.java:96) org.openid4java.discovery.yadis.CyberNekoDOMYadisHtmlParser.getHtmlMeta(CyberNekoDOMYadisHtmlParser.java:39) org.openid4java.discovery.yadis.YadisResolver.getHtmlMeta(YadisResolver.java:325) org.openid4java.discovery.yadis.YadisResolver.retrieveXrdsLocation(YadisResolver.java:453) org.openid4java.discovery.yadis.YadisResolver.discover(YadisResolver.java:252) org.openid4java.discovery.yadis.YadisResolver.discover(YadisResolver.java:232) org.openid4java.discovery.yadis.YadisResolver.discover(YadisResolver.java:166) org.openid4java.discovery.Discovery.discover(Discovery.java:147) org.openid4java.consumer.ConsumerManager.verifyDiscovered2(ConsumerManager.java:1693) org.openid4java.consumer.ConsumerManager.verifyDiscovered(ConsumerManager.java:1521) org.openid4java.consumer.ConsumerManager.verify(ConsumerManager.java:1156) org.springframework.security.openid.OpenID4JavaConsumer.endConsumption(OpenID4JavaConsumer.java:169) org.springframework.security.openid.OpenIDAuthenticationFilter.attemptAuthentication(OpenIDAuthenticationFilter.java:145) org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:211) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.hisp.dhis.security.filter.CustomAuthenticationFilter.doFilter(CustomAuthenticationFilter.java:64) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.hisp.dhis.security.filter.AutomaticAccessFilter.doFilter(AutomaticAccessFilter.java:115) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:57) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:50) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:344) org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:261) org.springframework.orm.hibernate4.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:150) org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18900: Minor, add missing @Override
revno: 18900 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Wed 2015-04-15 09:25:49 +0700 message: Minor, add missing @Override modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java -- 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-api/src/main/java/org/hisp/dhis/schema/Schema.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2015-03-20 03:13:40 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java 2015-04-15 02:25:49 + @@ -151,6 +151,7 @@ this.metadata = true; } +@Override @JsonProperty @JacksonXmlProperty( isAttribute = true ) public Class? getKlass() ___ 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
