r4086 Don't allow changing object's type after it is added to database,

this was known to cause minor side-effects.

renderEditObjectForm(): dismiss object type SELECT
updateObject(): update respectively
commitUpdateObject(): update respectively

diff --git a/ChangeLog b/ChangeLog
index 9cf94078905c14900dbbacfda98caa051a4b771d..7e2c7f0cd0a22ad2792538055bdef4a9d8adc67d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
        new feature: merge "objectlog" extension (by Ernest Shaffer)
        update: cache image files thumbnails and make them JPEGs (#369, by Matt Mills)
        update: enhance rackspace click helpers (by Jeroen Benda)
+       update: object type cannot be changed after the object is created
        bugfix: the feature of remembering last opened tab of realm page is now working
        update: UI: ports/IPs/nets highlighting enhancements
        bugfix: UI: pager in ipv4net shows appropriate page when IP is highlighted

diff --git a/inc/database.php b/inc/database.php
index 6612a2aa8e3b2706298e236b99b4fc28be8216d5..c460b9545297d46f5ca1c72dd32e6b61c4f29e90 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -635,20 +635,17 @@ function commitAddObject ($new_name, $new_label, $new_barcode, $new_type_id, $ne
        return $last_insert_id;
 }
 
-function commitUpdateObject ($object_id = 0, $new_name = '', $new_label = '', $new_barcode = '', $new_type_id = 0, $new_has_problems = 'no', $new_asset_no = '', $new_comment = '')
+function commitUpdateObject ($object_id = 0, $new_name = '', $new_label = '', $new_barcode = '', $new_has_problems = 'no', $new_asset_no = '', $new_comment = '')
 {
-       if ($new_type_id == 0)
-               throw new InvalidArgException ('$new_type_id', $new_type_id);
        $ret = FALSE !== usePreparedExecuteBlade
        (
-               'UPDATE RackObject SET name=?, label=?, barcode=?, objtype_id=?, has_problems=?, ' .
+               'UPDATE RackObject SET name=?, label=?, barcode=?, has_problems=?, ' .
                'asset_no=?, comment=? WHERE id=?',
                array
                (
                        !strlen ($new_name) ? NULL : $new_name,
                        $new_label,
                        !strlen ($new_barcode) ? NULL : $new_barcode,
-                       $new_type_id,
                        $new_has_problems,
                        !strlen ($new_asset_no) ? NULL : $new_asset_no,
                        $new_comment,

diff --git a/inc/interface.php b/inc/interface.php
index 45e0b084ac7bd6fbb76373572a9737734993a8bc..0a9b2a0ceb178934a00de08fd9bb0a1403a64310 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -671,9 +671,6 @@ function renderEditObjectForm ($object_id)
        // static attributes
        echo '<table border=0 cellspacing=0 cellpadding=3 align=center>';
        echo "<tr><td>&nbsp;</td><th colspan=2><h2>Attributes</h2></th></tr>";
-       echo "<tr><td>&nbsp;</td><th class=tdright>Type:</th><td class=tdleft>";
-       printNiftySelect (cookOptgroups (readChapter (CHAP_OBJTYPE, 'o')), array ('name' => 'object_type_id'), $object['objtype_id']);
-       echo "</td></tr>\n";
        // baseline info
        echo "<tr><td>&nbsp;</td><th class=tdright>Common name:</th><td class=tdleft><input type=text name=object_name value='${object['name']}'></td></tr>\n";
        echo "<tr><td>&nbsp;</td><th class=tdright>Visible label:</th><td class=tdleft><input type=text name=object_label value='${object['label']}'></td></tr>\n";

diff --git a/inc/ophandlers.php b/inc/ophandlers.php
index 94645dbeba9593b44e039644f2cbb3bbf729e6c5..6a85db6ec62847531a4fe77c0f58bd1bbbdf5097 100644 (file)
--- a/inc/ophandlers.php
+++ b/inc/ophandlers.php
@@ -879,7 +879,6 @@ function updateObject ()
 {
        assertUIntArg ('num_attrs', TRUE);
        assertUIntArg ('object_id');
-       assertUIntArg ('object_type_id');
        assertStringArg ('object_name', TRUE);
        assertStringArg ('object_label', TRUE);
        assertStringArg ('object_barcode', TRUE);
@@ -894,7 +893,6 @@ function updateObject ()
                $_REQUEST['object_name'],
                $_REQUEST['object_label'],
                $_REQUEST['object_barcode'],
-               $_REQUEST['object_type_id'],
                $has_problems,
                $_REQUEST['object_asset_no'],
                $_REQUEST['object_comment']