dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5910 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-10 15:57:23 +0100
message:
  (DV) Overwrite favorite -> system bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.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-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java	2012-02-09 13:03:47 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java	2012-02-10 14:53:26 +0000
@@ -362,6 +362,10 @@
         {
             chart.setUser( currentUserService.getCurrentUser() );
         }
+        else
+        {
+            chart.setUser( null );
+        }
 
         if ( trendLine != null )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-02-07 12:15:35 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-02-10 14:53:26 +0000
@@ -926,7 +926,7 @@
                     if (isUpdate) {
                         params.uid = DV.store.favorite.getAt(DV.store.favorite.findExact('name', params.name)).data.id;
                     }
-                    
+					
                     var url = DV.cmp.favorite.system.getValue() ? DV.conf.finals.ajax.favorite_addorupdatesystem : DV.conf.finals.ajax.favorite_addorupdate;                    
                     Ext.Ajax.request({
                         url: DV.conf.finals.ajax.path_visualizer + url,
@@ -3294,40 +3294,6 @@
                                 }
                             }
                         },
-                        {
-                            xtype: 'button',
-							cls: 'dv-toolbar-btn-2',
-                            text: 'nissa',
-                            handler: function() {
-								var tp = DV.cmp.dimension.organisationunit.treepanel;
-								
-								
-//tp.getSelectionModel().select(tp.getRootNode());return;								
-								var i = 0;
-								var ids = [19,20,21];
-								var paths = ['/18/19','/18/20','/18/21'];
-								
-								function expand(path) {
-									i++;
-									tp.expandPath(path, 'id', callback());
-								};			
-								
-								var callback = function() {
-									if (i >= paths.length) {
-										select();
-									}
-									else {
-										expand(paths[i]);
-									}
-								};								
-								
-								function select() {
-									tp.getSelectionModel().select(tp.getRootNode());
-								};									
-								
-								expand(paths[i]);
-                            }
-                        },
                         '->',
                         {
                             xtype: 'button',

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-02-06 14:43:00 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-02-10 13:12:36 +0000
@@ -1,5 +1,9 @@
 body {
-    font: normal 10px arial, ubuntu, sans-serif;
+    font: normal 10px arial,sans-serif,ubuntu,consolas;
+}
+
+.x-body, .x-btn-default-toolbar-small .x-btn-inner, .x-form-item {
+	font-family: arial,sans-serif,ubuntu,consolas;
 }
 
 .x-panel-body {
@@ -44,7 +48,7 @@
 
 /* Combobox field label font */
 .x-form-item-label {
-    font: 11px arial, ubuntu;
+    font: 11px arial,sans-serif,ubuntu,consolas;
     color: #111;
 }
 
@@ -597,3 +601,10 @@
 .dv-menugrid .x-grid-view {
     background-color: #f1f1f1;
 }
+w {
+    background-color: #f1f1f1;
+}
+nu*/
+.dv-menugrid .x-grid-view {
+    background-color: #f1f1f1;
+}