Changeset 1324

Timestamp:

01/21/08 13:54:26 (9 months ago)

Author:

benoitg

Message:

• Fix #42 (Node cannot be renamed)
  

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (5 diffs)
• trunk/wifidog-auth/wifidog/classes/Permission.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
-# $Id$
+
+2008-01-16 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Fix #42 (Node cannot be renamed)
+        
-2008-01-16 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Temporary patch for problem introduced in [1319]:  the menu did not display where main_area_top is empty (which is actually most places in the admin interface).  This shouldn't have been done in the first place, as it doesn't fix the problem the menu cause of theming, and worse causes people to edit MainUI_Display.tpl, causing such errors.  A network config option should have been provided to allow selecting in what area the menu goes.

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

@@ -1035 +1035 @@
-        $permArray[]=array(Permission::P('NODE_PERM_EDIT_CONFIG'), $this);
-        $permArray[]=array(Permission::P('NODE_PERM_EDIT_GATEWAY_ID'), $this);
+        $permArray[]=array(Permission::P('NODE_PERM_EDIT_DEPLOYMENT_DATE'), $this);
-        Security::requireAnyPermission($permArray);
-        require_once('classes/InterfaceElements.php');
@@ -1095 +1096 @@
-
-        // Name
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        // Creation date
-        $_title = _("Creation date");
-
+
+
+
+
-            $_data = DateTimeWD::getSelectDateTimeUI(new DateTimeWD($this->getCreationDate()), "node_" . $node_id . "_creation_date", DateTimeWD::INTERFACE_DATETIME_FIELD, "node_creation_date_input");
-        } else {
@@ -1264 +1278 @@
-        $permArray[]=array(Permission::P('NODE_PERM_EDIT_CONFIG'), $this);
-        $permArray[]=array(Permission::P('NODE_PERM_EDIT_GATEWAY_ID'), $this);
+        $permArray[]=array(Permission::P('NODE_PERM_EDIT_DEPLOYMENT_DATE'), $this);
-        Security::requireAnyPermission($permArray);
-        // Check if user is a admin
@@ -1285 +1300 @@
-
-        // Name
-
+
+
+
+
-            $name = "node_".$node_id."_name";
-            $this->setName($_REQUEST[$name]);
-        } else {
-            $this->setName($this->getName());
-        }
-
-        // Creation date
-
+
+
+
+
-            $name = "node_".$node_id."_creation_date";
-            $this->setCreationDate(DateTimeWD::processSelectDateTimeUI($name, DateTimeWD :: INTERFACE_DATETIME_FIELD)->getIso8601FormattedString());
-        } else {
-            $this->setCreationDate($this->getCreationDate());
-        }
-
@@ -1623 +1640 @@
-            }
-        }
-    
+
-            $items[] = array('path' => 'node/node_add_new',
-                'title' => sprintf(_("Add a new node")),

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

@@ -100 +100 @@
-            
-            $PERMISSIONS['NODE_PERM_EDIT_GATEWAY_ID'] = array(_("User is allowed to change the gateway id of this node"), StakeholderType::Node, false);
+            $PERMISSIONS['NODE_PERM_EDIT_NAME'] = array(_("User is allowed to change the public name of this node"), StakeholderType::Node, false);
+            $PERMISSIONS['NODE_PERM_EDIT_DEPLOYMENT_DATE'] = array(_("User is allowed to change the deployment date of this node"), StakeholderType::Node, false);
+            
-            $PERMISSIONS['NODE_PERM_EDIT_CONFIG'] = array(_("TEMPORARY:  User is allowed to edit general configuration for this node.  This will be replaced with more granular permissions in the future"), StakeholderType::Node, false);
-