Changeset 601 for trunk/wifidog-auth/wifidog/classes/ContentGroupElement.php

Timestamp:

04/29/05 14:21:46 (7 years ago)

Author:

fproulx

Message:

2005-04-29 Fran�ois Proulx <francois.proulx@…>

• Removed all inline unuseful javascript code on submit buttons onclick='submit()'
• This conflicted with the actual click on the submit button in Safari
• Fixed check in Network for isOwner, only check superAdmin
• Fixed bug so you can't add an existing content group to itself ( deadlock )
• Started coding Pattern language narrative display

Files:

• trunk/wifidog-auth/wifidog/classes/ContentGroupElement.php (modified) (4 diffs)

trunk/wifidog-auth/wifidog/classes/ContentGroupElement.php

@@ -142 +142 @@
                                 $html .= "<div class='admin_section_tools'>\n";
                                 $name = "content_group_element_".$this->id."_allowed_node_".$node->GetId()."_remove";
-                                $html .= "<input type='submit' name='$name' value='"._("Remove")."' onclick='submit();'>";
+                                $html .= "<input type='submit' name='$name' value='"._("Remove")."'>";
                                 $html .= "</div>\n";
                                 $html .= "</li>\n";
@@ -155 +155 @@
                 $html .= Node :: getSelectNodeUI($name, $sql_additional_where);
                 $name = "content_group_element_{$this->id}_new_allowed_node_submit";
-                $html .= "<input type='submit' name='$name' value='"._("Add new allowed node")."' onclick='submit();'>";
+                $html .= "<input type='submit' name='$name' value='"._("Add new allowed node")."'>";
                 $html .= "</li'>\n";
 
@@ -168 +168 @@
             $html .= "<b>"._("Add a new displayed content OR select an existing one")."</b><br>";
                         $html .= self :: getNewContentUI("content_group_element_{$this->id}_new_displayed_content")."<br>";
-            $html .= self :: getSelectContentUI("content_group_element_{$this->id}_new_displayed_existing_element");
+            $html .= self :: getSelectContentUI("content_group_element_{$this->id}_new_displayed_existing_element", "AND content_id != '$this->id'");
             $html .= "<input type='submit' name='content_group_element_{$this->id}_new_displayed_existing_element_add' value='"._("Add")."'>";
                 }
@@ -177 +177 @@
                         $html .= "<div class='admin_section_tools'>\n";
                         $name = "content_group_element_{$this->id}_erase_displayed_content";
-                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                         $html .= "</div>\n";
                 }