[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 11789: Dashboard, added missing hibernate mapping
revno: 11789 committer: Lars Helge Øverland branch nick: dhis2 timestamp: Sun 2013-08-25 15:14:37 +0200 message: Dashboard, added missing hibernate mapping modified: dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.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-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.xml 2013-08-20 07:25:50 + +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.xml 2013-08-25 13:14:37 + @@ -39,6 +39,12 @@ + + + + + + ___ 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 11790: Css fix
revno: 11790
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sun 2013-08-25 16:20:41 +0200
message:
Css fix
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
--
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/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-08-16 12:29:21 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-08-25 14:20:41 +
@@ -707,7 +707,7 @@
margin-right: 4px;
font-family: LiberationSansBold, arial;
font-size: 13px;
- background-color: #3685D5;
+ background-color: #3581CE;
color: #fff !important;
text-decoration: none !important;
}
@@ -715,7 +715,7 @@
.blueButtonLink:hover
{
text-decoration: none;
- background-color: #2C7CCE;
+ background-color: #3176BD;
}
/**/
___
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] [Bug 1216617] [NEW] HTTP Status 500 - org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the co
Public bug reported: Am using window 7 ultimate,tomcat7..if i try to deploy small size file it works out...but dhis2 doesnt work..am totally confused..what is the way from this ERROR below. HTTP Status 500 - org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) type Exception report message org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) description The server encountered an internal error that prevented it from fulfilling this request. exception java.lang.IllegalStateException: org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) org.apache.catalina.connector.Request.parseParts(Request.java:2688) org.apache.catalina.connector.Request.parseParameters(Request.java:2932) org.apache.catalina.connector.Request.getParameter(Request.java:1096) org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) root cause org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) org.apache.tomcat.util.http.fileupload.FileUploadBase$FileItemIteratorImpl.(FileUploadBase.java:813) org.apache.tomcat.util.http.fileupload.FileUploadBase.getItemIterator(FileUploadBase.java:258) org.apache.tomcat.util.http.fileupload.FileUploadBase.parseRequest(FileUploadBase.java:282) org.apache.catalina.connector.Request.parseParts(Request.java:2621) org.apache.catalina.connector.Request.parseParameters(Request.java:2932) org.apache.catalina.connector.Request.getParameter(Request.java:1096) org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) note The full stack trace of the root cause is available in the Apache Tomcat/8.0.0-RC1 logs. ** Affects: dhis2 Importance: Undecided Status: New -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1216617 Title: HTTP Status 500 - org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800)..i have spent almost a day trying to deploy DHIS2 to tomcat7,and i have changed the web.xml values to 90MB but still giving the same error,any help am stuck. Status in DHIS 2: New Bug description: Am using window 7 ultimate,tomcat7..if i try to deploy small size file it works out...but dhis2 doesnt work..am totally confused..what is the way from this ERROR below. HTTP Status 500 - org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) type Exception report message org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) description The server encountered an internal error that prevented it from fulfilling this request. exception java.lang.IllegalStateException: org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds the configured maximum (52428800) org.apache.catalina.connector.Request.parseParts(Request.java:2688) org.apache.catalina.connector.Request.parseParameters(Request.java:2932) org.apache.catalina.connector.Request.getParameter(Request.java:1096) org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) root cause org.apache.tomcat.util.http.fileupload.FileUp
Re: [Dhis2-devs] [Bug 1216617] [NEW] HTTP Status 500 - org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds th
Are you trying to deploy it via the Tomcat manager? The war file is rather large and this may be the problem. If you are able to please try copying the war file to the tomcat/webapps directory directly. Tomcat should auto deploy the war. Dan Cocos BAO Systems dco...@baosystems.com T: +1 202-352-2671 | Skype: dancocos On Aug 25, 2013, at 1:26 PM, Mathayo Mihayo wrote: > Public bug reported: > > Am using window 7 ultimate,tomcat7..if i try to deploy small size file > it works out...but dhis2 doesnt work..am totally confused..what is the > way from this ERROR below. > > HTTP Status 500 - > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > type Exception report > > message > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > description The server encountered an internal error that prevented it > from fulfilling this request. > > exception > > java.lang.IllegalStateException: > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the configured > maximum (52428800) > org.apache.catalina.connector.Request.parseParts(Request.java:2688) > org.apache.catalina.connector.Request.parseParameters(Request.java:2932) > org.apache.catalina.connector.Request.getParameter(Request.java:1096) > > org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) > > org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) > org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) > > org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) > > root cause > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the configured > maximum (52428800) > > org.apache.tomcat.util.http.fileupload.FileUploadBase$FileItemIteratorImpl.(FileUploadBase.java:813) > > org.apache.tomcat.util.http.fileupload.FileUploadBase.getItemIterator(FileUploadBase.java:258) > > org.apache.tomcat.util.http.fileupload.FileUploadBase.parseRequest(FileUploadBase.java:282) > org.apache.catalina.connector.Request.parseParts(Request.java:2621) > org.apache.catalina.connector.Request.parseParameters(Request.java:2932) > org.apache.catalina.connector.Request.getParameter(Request.java:1096) > > org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) > > org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) > org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) > > org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) > > note The full stack trace of the root cause is available in the Apache > Tomcat/8.0.0-RC1 logs. > > ** Affects: dhis2 > Importance: Undecided > Status: New > > -- > You received this bug notification because you are a member of DHIS 2 > developers, which is subscribed to DHIS. > https://bugs.launchpad.net/bugs/1216617 > > Title: > HTTP Status 500 - > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800)..i have spent almost a day trying to > deploy DHIS2 to tomcat7,and i have changed the web.xml values to 90MB > but still giving the same error,any help am stuck. > > Status in DHIS 2: > New > > Bug description: > Am using window 7 ultimate,tomcat7..if i try to deploy small size file > it works out...but dhis2 doesnt work..am totally confused..what is the > way from this ERROR below. > > HTTP Status 500 - > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > type Exception report > > message > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > description The server encountered an internal error that prevented it > from fulfilling this request. > > exception > > java.lang.IllegalStateException: > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the configured > maximum (52428800) > org.apache.catalina.connector.Request.parseParts(Request.java:2688) > org.apache.catalina.connector.Request.parseParame
Re: [Dhis2-devs] [Bug 1216617] [NEW] HTTP Status 500 - org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: the request was rejected because its size (84161792) exceeds th
Hi Mathayo, Thanks to Dan for the solution. Please don't report issues like this as bugs, but rather sign up for the user mailing list https://launchpad.net/~dhis2-users Unfortunately, it seems people are not able to find the information on how to join our mailing list - perhaps we need to put it on the front page: http://www.dhis2.org/about Knut On Sun, Aug 25, 2013 at 7:41 PM, Dan Cocos wrote: > Are you trying to deploy it via the Tomcat manager? The war file is rather > large and this may be the problem. > If you are able to please try copying the war file to the tomcat/webapps > directory directly. Tomcat should auto deploy the war. > > > Dan Cocos > *BAO Systems* > dco...@baosystems.com > T: +1 202-352-2671 | Skype: dancocos > > On Aug 25, 2013, at 1:26 PM, Mathayo Mihayo wrote: > > Public bug reported: > > Am using window 7 ultimate,tomcat7..if i try to deploy small size file > it works out...but dhis2 doesnt work..am totally confused..what is the > way from this ERROR below. > > HTTP Status 500 - > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > type Exception report > > message > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > description The server encountered an internal error that prevented it > from fulfilling this request. > > exception > > java.lang.IllegalStateException: > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the configured > maximum (52428800) > org.apache.catalina.connector.Request.parseParts(Request.java:2688) > org.apache.catalina.connector.Request.parseParameters(Request.java:2932) > org.apache.catalina.connector.Request.getParameter(Request.java:1096) > > org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) > > org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) > org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) > > org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) > > root cause > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the configured > maximum (52428800) > > org.apache.tomcat.util.http.fileupload.FileUploadBase$FileItemIteratorImpl.(FileUploadBase.java:813) > > org.apache.tomcat.util.http.fileupload.FileUploadBase.getItemIterator(FileUploadBase.java:258) > > org.apache.tomcat.util.http.fileupload.FileUploadBase.parseRequest(FileUploadBase.java:282) > org.apache.catalina.connector.Request.parseParts(Request.java:2621) > org.apache.catalina.connector.Request.parseParameters(Request.java:2932) > org.apache.catalina.connector.Request.getParameter(Request.java:1096) > > org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:383) > > org.apache.catalina.filters.CsrfPreventionFilter.doFilter(CsrfPreventionFilter.java:184) > org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:91) > > org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108) > > note The full stack trace of the root cause is available in the Apache > Tomcat/8.0.0-RC1 logs. > > ** Affects: dhis2 > Importance: Undecided > Status: New > > -- > You received this bug notification because you are a member of DHIS 2 > developers, which is subscribed to DHIS. > https://bugs.launchpad.net/bugs/1216617 > > Title: > HTTP Status 500 - > > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800)..i have spent almost a day trying to > deploy DHIS2 to tomcat7,and i have changed the web.xml values to 90MB > but still giving the same error,any help am stuck. > > Status in DHIS 2: > New > > Bug description: > Am using window 7 ultimate,tomcat7..if i try to deploy small size file > it works out...but dhis2 doesnt work..am totally confused..what is the > way from this ERROR below. > > HTTP Status 500 - > > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > type Exception report > > message > > > org.apache.tomcat.util.http.fileupload.FileUploadBase$SizeLimitExceededException: > the request was rejected because its size (84161792) exceeds the > configured maximum (52428800) > > description The server encountered an internal error that prevented it > from fulfilling this request. > > exception > > java.lang.IllegalStateException: > org.apache.tom
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 11791: (PT) Minor bugs fixed.
revno: 11791
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Sun 2013-08-25 20:44:06 +0200
message:
(PT) Minor bugs fixed.
modified:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-08-17 10:22:45 +
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-08-25 18:44:06 +
@@ -1,8 +1,8 @@
Ext.onReady( function() {
-
- // ext config
+
+ // ext config
Ext.Ajax.method = 'GET';
-
+
// namespace
if (!('PT' in window)) {
PT = {
@@ -12,13 +12,13 @@
// mode
PT.isDebug = false;
-
+
// html5
PT.isSessionStorage = 'sessionStorage' in window && window['sessionStorage'] !== null;
// core
-
- PT.core = {};
+
+ PT.core = {};
PT.core.instances = [];
PT.core.getInstance = function(init) {
@@ -309,7 +309,7 @@
}
}
};
-
+
util.store = {
addToStorage: function(s, records) {
s.each( function(r) {
@@ -428,7 +428,7 @@
return str.replace(new RegExp(find, 'g'), replace);
}
};
-
+
util.color = {
hexToRgb: function(hex) {
var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
@@ -459,18 +459,13 @@
util.message = {
alert: function(message) {
- if (pt.isPlugin) {
- console.log(pt.init.el + ': ' + message);
- }
- else {
- alert(message);
- }
+alert(message);
}
};
}());
// init
- (function() {
+ (function() {
// sort and extend dynamic dimensions
init.dimensions = util.array.sortObjectsByString(init.dimensions);
@@ -645,7 +640,7 @@
}
dimensions = Ext.Array.clean([].concat(layout.columns, layout.rows, layout.filters));
-
+
for (var i = 0; i < dimensions.length; i++) {
objectNameDimensionMap[dimensions[i].dimension] = dimensions[i];
}
@@ -655,19 +650,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
-pt.util.message.alert(PT.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+util.message.alert(PT.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
-pt.util.message.alert(PT.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+util.message.alert(PT.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
-pt.util.message.alert(PT.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+util.message.alert(PT.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
return;
}
}
@@ -675,32 +670,32 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- pt.util.message.alert('Indicators and detailed data elements cannot be specified together');
+ util.message.alert('Indicators and detailed data elements cannot be specified together');
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- pt.util.message.alert('Detailed data elements and totals cannot be specified together');
+ util.message.alert('Detailed data elements and totals cannot be specified together');
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- pt.util.message.alert('Data sets and detailed data elements cannot be specified together');
+ util.message.alert('Data sets and detailed data elements cannot be specified together');
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- pt.util.message.alert('Categories and detailed data elements cannot be specified together');
+ util.message.alert('Cat
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 11792: Data set add/update, made description field a text area
revno: 11792
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sun 2013-08-25 22:18:18 +0200
message:
Data set add/update, made description field a text area
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
--
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/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-08-25 14:20:41 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-08-25 20:18:18 +
@@ -91,7 +91,7 @@
#detailsArea
{
display: none;
- border: 1px solid #ececec;
+ border: 1px solid #ddd;
position: fixed;
top: 150px;
width: 233px;
@@ -99,6 +99,7 @@
padding: 15px;
overflow: auto;
color: #222;
+ box-shadow: #f2f2f2 0 1px 1px 0;
}
#detailsArea label
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-08-13 16:43:37 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-08-25 20:18:18 +
@@ -75,7 +75,7 @@
$i18n.getString( "description" )
-
+
$i18n.getString( "expiry_days" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-08-13 18:04:12 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-08-25 20:18:18 +
@@ -75,7 +75,7 @@
$i18n.getString( "description" )
-
+$!encoder.htmlEncode( $dataSet.description )
$i18n.getString( "expiry_days" )
___
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 11793: Data entry, fixed bug related to org unit param
revno: 11793
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sun 2013-08-25 22:46:47 +0200
message:
Data entry, fixed bug related to org unit param
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2013-08-23 16:12:16 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2013-08-25 20:46:47 +
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# 2.13-SNAPSHOT V10
+# 2.13-SNAPSHOT V11
NETWORK:
*
CACHE:
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java 2013-08-25 20:46:47 +
@@ -186,6 +186,7 @@
public String execute()
throws Exception
{
+System.out.println("ou " + organisationUnitId);
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
DataSet dataSet = dataSetService.getDataSet( dataSetId );
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2013-08-19 14:27:44 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2013-08-25 20:46:47 +
@@ -80,8 +80,9 @@
var DAO = DAO || {};
-function getCurrentOrganisationUnit() {
-if( $.isArray( currentOrganisationUnitId ) ) {
+function getCurrentOrganisationUnit()
+{
+if ( $.isArray( currentOrganisationUnitId ) ) {
return currentOrganisationUnitId[0];
}
@@ -97,7 +98,7 @@
( function( $ ) {
$.safeEach = function( arr, fn )
{
-if( arr )
+if ( arr )
{
$.each( arr, fn );
}
@@ -1306,7 +1307,7 @@
validate( true, function() {
var params = storageManager.getCurrentCompleteDataSetParams();
-params['organisationUnitId'] = selection.getSelected();
+params['organisationUnitId'] = getCurrentOrganisationUnit();
params['multiOrganisationUnit'] = multiOrganisationUnit;
storageManager.saveCompleteDataSet( params );
@@ -1341,7 +1342,7 @@
{
var confirmed = confirm( i18n_confirm_undo );
var params = storageManager.getCurrentCompleteDataSetParams();
-params[ 'organisationUnitId' ] = selection.getSelected();
+params[ 'organisationUnitId' ] = getCurrentOrganisationUnit();
params[ 'multiOrganisationUnit' ] = multiOrganisationUnit;
if ( confirmed )
@@ -1451,7 +1452,7 @@
var validCompleteOnly = dataSets[currentDataSetId].validCompleteOnly;
var params = storageManager.getCurrentCompleteDataSetParams();
- params['organisationUnitId'] = selection.getSelected();
+ params['organisationUnitId'] = getCurrentOrganisationUnit();
params['multiOrganisationUnit'] = multiOrganisationUnit;
$( '#validationDiv' ).load( 'validate.action', params, function( response, status, xhr ) {
___
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 11794: Data set, bumping version on edit if render-as-tabs has changed
revno: 11794
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sun 2013-08-25 23:06:44 +0200
message:
Data set, bumping version on edit if render-as-tabs has changed
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.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-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-08-25 21:06:44 +
@@ -274,8 +274,11 @@
dataSet.setExpiryDays( expiryDays );
dataSet.setSkipAggregation( skipAggregation );
-if ( !(equalsNullSafe( name, dataSet.getName() ) && periodType.equals( dataSet.getPeriodType() )
-&& dataElements.equals( dataSet.getDataElements() ) && indicators.equals( dataSet.getIndicators() )) )
+if ( !( equalsNullSafe( name, dataSet.getName() ) &&
+periodType.equals( dataSet.getPeriodType() ) &&
+dataElements.equals( dataSet.getDataElements() ) &&
+indicators.equals( dataSet.getIndicators() ) &&
+renderAsTabs == dataSet.isRenderAsTabs() ) )
{
dataSet.increaseVersion(); // Check if version must be updated
}
___
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 11795: fixes NPE in SharingUtils.canExernalize
revno: 11795
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Sun 2013-08-25 23:44:57 +0200
message:
fixes NPE in SharingUtils.canExernalize
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.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/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-08-23 17:19:21 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-08-25 21:44:57 +
@@ -336,6 +336,11 @@
*/
public static boolean canExternalize( User user, T object )
{
+if ( user == null )
+{
+return false;
+}
+
Set authorities = user.getUserCredentials().getAllAuthorities();
return EXTERNAL_AUTHORITIES.get( object.getClass() ) != null &&
___
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 11796: bugfix for ExternalAccessVoter, allow any access to any fileextension
revno: 11796
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Mon 2013-08-26 00:05:17 +0200
message:
bugfix for ExternalAccessVoter, allow any access to any fileextension
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ExternalAccessVoter.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-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ExternalAccessVoter.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ExternalAccessVoter.java 2013-08-24 13:31:19 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ExternalAccessVoter.java 2013-08-25 22:05:17 +
@@ -107,7 +107,7 @@
if ( urlSplit[1].equals( "api" ) && externalClasses.get( type ) != null )
{
-String uid = urlSplit[3];
+String uid = getUidPart( urlSplit[3] );
if ( CodeGenerator.isValidCode( uid ) )
{
@@ -128,4 +128,14 @@
return ACCESS_ABSTAIN;
}
+
+private String getUidPart( String uidPath )
+{
+if ( uidPath.contains( "." ) )
+{
+return uidPath.substring( 0, uidPath.indexOf( "." ) );
+}
+
+return uidPath;
+}
}
___
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] how to add org goup by using web-api?
Hi,sir Is there some way to add org group and add to group set? -- 此致 easy 莫愁前路无知己，天下谁人不识君。___ 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 11797: fix bug SMS reminder
revno: 11797
committer: Lai
branch nick: dhis2
timestamp: Mon 2013-08-26 10:41:29 +0700
message:
fix bug SMS reminder
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.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/sms/outbound/OutboundSms.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java 2013-08-23 15:56:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java 2013-08-26 03:41:29 +
@@ -33,12 +33,14 @@
import java.util.HashSet;
import java.util.Set;
-public class OutboundSms
+import org.hisp.dhis.common.BaseIdentifiableObject;
+
+public class OutboundSms extends BaseIdentifiableObject
{
+private static final long serialVersionUID = 1L;
+
public static final String DHIS_SYSTEM_SENDER = "DHIS-System";
-private int id;
-
private String sender;
private Set recipients;
@@ -60,16 +62,6 @@
Collections.addAll( this.recipients, recipients );
}
-public int getId()
-{
-return id;
-}
-
-public void setId( int id )
-{
-this.id = id;
-}
-
public Set getRecipients()
{
return recipients;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java 2013-08-26 03:41:29 +
@@ -45,6 +45,7 @@
import org.hisp.dhis.user.UserSetting;
import org.hisp.dhis.user.UserSettingService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
/**
* @author Nguyen Kim Lai
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java 2013-08-26 03:41:29 +
@@ -30,11 +30,15 @@
import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
+
/**
* Simple {@link OutboundSmsService sms service} storing the sms in a store and
* forwards the request to a {@link OutboundSmsTransportService sms transport
* service} for sending.
*/
+
+@Transactional
public class DefaultOutboundSmsService
implements OutboundSmsService
{
___
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] how to add org goup by using web-api?
Yes, this should be doable. I would suggest looking at the format here: http://apps.dhis2.org/dev/api/metaData.xml?assumeTrue=false&organisationUnitGroups=true&organisationUnitGroupSets=true (login with admin / district). To see how to send meta-data, you can look at the documentation here: http://www.dhis2.org/doc/snapshot/en/user/html/ch25s05.html -- Morten On Mon, Aug 26, 2013 at 4:31 AM, easy wrote: > Hi,sir > Is there some way to add org group and add to group set? > > > > > -- > 此致 > >easy > > 莫愁前路无知己，天下谁人不识君。 > > > > ___ > 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 > > ___ 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
