Changeset 15204

Timestamp:

02/23/08 00:17:16 (8 months ago)

Author:

flack

Message:

make chooser creation mode work correctly if there is more than one chooser widget in the current form

Files:

• branches/MidCOM_2_8/midcom.helper.datamanager2/widget/chooser.php (modified) (13 diffs)
• branches/MidCOM_2_8/midgard.admin.asgard/style/midgard_admin_asgard_object_create_after.php (modified) (1 diff)

branches/MidCOM_2_8/midcom.helper.datamanager2/widget/chooser.php

@@ -204 +204 @@
-    /**
-     * These options are always visible
- 
+
-     * @var array
-     */
@@ -284 +284 @@
-    /**
-     * The group of widgets items as QuickForm elements
- 
+
-     * @var array
-     */
-    var $widget_elements = array();
-
+
-    var $_static_items_html = "";
-    var $_added_static_items = array();
-
+
-    var $allow_multiple = true;
-    var $require_corresponding_option = true;
@@ -1094 +1094 @@
-            $dialog_id = $this->_element_id . '_creation_dialog';
-
-            $dialog_js = '<script type="text/javascript">';
-            $dialog_js .= "function close_dialog(){jQuery('#{$dialog_id}').hide();};";
-            $dialog_js .= "function add_item(data){jQuery('#{$this->_element_id}_search_input').midcom_helper_datamanager2_widget_chooser_add_result_item(data);};";
-            $dialog_js .= '</script>';
-
-            $dialog_html = '<div class="chooser_widget_creation_dialog" id="' . $dialog_id . '">';
-            $dialog_html .= '<div class="chooser_widget_creation_dialog_content_holder">';
-            $dialog_html .= $dialog_js;
-            $dialog_html .= '</div>';
-            $dialog_html .= '</div>';
@@ -1151 +1145 @@
-        // debug_pop();
-
-        
+
-        $this->_static_items_html .= "<table class=\"widget_chooser_static_items_table\">\n<thead><tr>\n";
-
+
-        if (   !empty($this->reflector_key)
-            && !$this->result_headers)
@@ -1165 +1159 @@
-            {
-                $this->_static_items_html .= "    <th class=\"{$header_item['name']}\">{$header_item['title']}&nbsp;</th>\n";
-            
-
-
+
+
+
-        $title = $_MIDCOM->i18n->get_string('Selected', 'midcom.helper.datamanager2');
-        $this->_static_items_html .= "    <th class=\"selected\">{$title}&nbsp;</th>\n";
-
+
-        $this->_static_items_html .= "</tr></thead>\n<tbody>\n";
-
+
-        $ee_script = '';
-        if ($this->_renderer_callback)
@@ -1207 +1201 @@
-            }
-        }
-
+
-        $this->_jscript .= $ee_script;
-
@@ -1226 +1220 @@
-            $this->_jscript
-        );
-
+
-        $this->widget_elements[] =& HTML_QuickForm::createElement
-        (
@@ -1237 +1231 @@
-        $group =& $this->_form->addGroup($this->widget_elements, $this->name, $this->_translate($this->_field['title']), '', array('class' => 'midcom_helper_datamanager2_widget_chooser'));
-    }
-
+
-    function _add_existing_item_as_static($key)
-    {
@@ -1243 +1237 @@
-        $id_field = $this->id_field;
-        $item_id = @$object->$id_field;
-
+
-        if (   empty($item_id)
-            || isset($this->_added_static_items[$item_id]))
@@ -1249 +1243 @@
-            return;
-        }
-
+
-        $this->_static_items_html .= "<tr id=\"{$this->_element_id}_existing_item_{$item_id}_row\" class=\"chooser_widget_existing_item_static_row\">\n";
-
+
-        if (   !empty($this->reflector_key)
-            && !$this->result_headers)
@@ -1269 +1263 @@
-                // $value = rawurlencode(utf8_decode($value));
-                // debug_add("adding header item: name={$item_name} value={$value}");
-         
+
-                $this->_static_items_html .= "<td class=\"{$item_name}\">{$value}&nbsp;</td>";
-            }
-        }
-
+
-        $this->_static_items_html .= "<td>\n";
-        $this->_static_items_html .= "<input type=\"checkbox\" name=\"{$this->_element_id}_selections[{$item_id}]\" id=\"{$this->_element_id}_existing_item_{$item_id}_value\" class=\"chooser_widget_existing_item_static_input\" checked=\"checked\"/>\n";
-        $this->_static_items_html .= "</td>\n";
-
+
-        $this->_static_items_html .= "</tr>\n";
-
+
-        $this->_added_static_items[$item_id] = true;
-    }
@@ -1390 +1384 @@
-                return $this->_callback->resolve_object_name($key);
-            }
-
+
-            $results = $this->_callback->get_key_data($key);
-
@@ -1452 +1446 @@
-
-        $_MIDCOM->auth->drop_sudo();
-
+
-        // debug_pop();
-        if ($return_object)

branches/MidCOM_2_8/midgard.admin.asgard/style/midgard_admin_asgard_object_create_after.php

@@ -1 +1 @@
-<script type="text/javascript">
+   /*
+    * we need to determine the correct widget_id prefix here, loading from the parent
+    * frame breaks when multiple choosers with creation support exist
+    */
+   var widget_id = window.parent.jQuery("iframe[src^=" + window.location.pathname + "]").attr("id");
+   widget_id = widget_id.replace('chooser_widget_creation_dialog_content','');
+
+
+   function close_dialog(){window.parent.jQuery('#' + widget_id + '_creation_dialog').hide();};
+   function add_item(data){window.parent.jQuery('#' + widget_id + '_search_input').midcom_helper_datamanager2_widget_chooser_add_result_item(data);};
-    <?php
-    if (! isset($data['cancelled']))
-    {
-
+
+
-    }
-    ?>
-window.parent.
+
-</script>