Changeset 14990

Timestamp:

02/13/08 13:47:31 (10 months ago)

Author:

w_i

Message:

Added possibility to add additional XEP keys to position through widget config.
Fixed coordinates and place info input updating

Files:

• trunk/midcom/midcom.helper.datamanager2/static/position/widget.js (modified) (3 diffs)
• trunk/midcom/midcom.helper.datamanager2/type/position.php (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager2/widget/position.php (modified) (3 diffs)

trunk/midcom/midcom.helper.datamanager2/static/position/widget.js

@@ -163 +163 @@
-                var parsed = parse_response(data);
-                update_widget_inputs(parsed[0], true, true);
-
+//
-            }
-        });
@@ -250 +250 @@
-                var parsed = parse_response(data);
-                update_widget(parsed[0]);
-
+//
-            }
-        });
@@ -329 +329 @@
-        geodata_btn.show();
-        revgeodata_btn.show();
-
+
+
+
+
+
+
+
-        jQuery.each(location_data, function(key,value){
-            if (input_data[key])
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                {
-                    if (   no_override
-
+0
-                    {
-                        jQuery('#' + input_data[key]['id']).attr('value',value);
-                    }
-                    else
-                    {
-                        if (value != '')
-                        {
-                            var parent = jQuery('#' + input_data[key]['id']).parent();
-                            jQuery("span.proposal",parent).html(' (' + value + ')');
-                        }
-                    }
-                    
-                    if (! no_override)
-                    {
+                        if (value != '0') {
+                            jQuery('#' + input_data[key]['id']).attr('value',value);
+                        }
+                    }
+                }
+                
+                if (   no_override
+                    && (   jQuery('#' + input_data[key]['id']).attr('value') == ''
+                        || typeof jQuery('#' + input_data[key]['id']).attr('value') == 'undefined'))
+                {
+                    jQuery('#' + input_data[key]['id']).attr('value',value);
+                }
+                else
+                {
+                    if (value != '')
+                    {
+                        var parent = jQuery('#' + input_data[key]['id']).parent();
+                        jQuery("span.proposal", parent).html(' (' + value + ')');
+                    }
+                }
+                
+                if (! no_override)
+                {
+                    if (value != '') {
-                        jQuery('#' + input_data[key]['id']).attr('value',value);
-                    }

trunk/midcom/midcom.helper.datamanager2/type/position.php

@@ -102 +102 @@
-            $adr_properties[] = "<span class=\"description\">{$this->location->description}</span>";
-        }
+        if ($this->location->text)
+        {
+            $adr_properties[] = "<span class=\"text\">{$this->location->text}</span>";
+        }
-        if ($this->location->room)
-        {

trunk/midcom/midcom.helper.datamanager2/widget/position.php

@@ -69 +69 @@
-     */
-    var $input_defaults = array();
-
+
+
+
+
+
+
+
+
+
+
-    /**
-     * The group of widgets items as QuickForm elements
@@ -375 +384 @@
-        foreach ($this->_other_xep_keys as $xep_key)
-        {
-sset($this->_type->location->$xep_key
-$this->_type->location->$xep_key != ''
+n_array($xep_key, $this->use_xep_keys
+isset($this->_type->location->$xep_key)
-                && !in_array($xep_key, $inserted_xep_keys))
-            {
@@ -691 +700 @@
-            $this->_type->location->longitude = $results["{$this->_element_id}_input_coordinates_longitude"];
-        }
+        
+        foreach ($this->_other_xep_keys as $xep_key)
+        {
+            if (   in_array($xep_key, $this->use_xep_keys)
+                && isset($this->_type->location->$xep_key))
+            {
+                $this->_type->location->$xep_key = $results["{$this->_element_id}_input_place_{$xep_key}"];
+            }
+        }
-    }
-