fixing issue opennetadmin#116

Gankarloo · Jan 3, 2018 · d295d22 · d295d22
1 parent 6811890
commit d295d22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/install/ona-table_schema.xml b/install/ona-table_schema.xml
@@ -861,10 +861,6 @@
       <KEY/>
       <UNSIGNED/>
     </field>
-    <field name="network_role_id" type="I" size="10">
-      <NOTNULL/>
-      <UNSIGNED/>
-    </field>
     <field name="subnet_type_id" type="I" size="10">
       <NOTNULL/>
       <UNSIGNED/>

diff --git a/www/modules/ona/subnet.inc.php b/www/modules/ona/subnet.inc.php
@@ -35,7 +35,7 @@ function subnet_display($options="") {
     $text_array = array();
 
     // Version - UPDATE on every edit!
-    $version = '1.03';
+    $version = '1.04';
 
     // Parse incoming options string to an array
     $options = parse_options($options);
@@ -121,7 +121,6 @@ function subnet_display($options="") {
     }
 
     // cleanup some un-used junk
-    unset($text_array['network_role_id']);
     unset($text_array['vlan_id']);
 
     // change the output format if other than default
@@ -169,7 +168,7 @@ function subnet_add($options="") {
     printmsg('DEBUG => subnet_add('.$options.') called', 3);
 
     // Version - UPDATE on every edit!
-    $version = '1.07';
+    $version = '1.08';
 
     // Parse incoming options string to an array
     $options = parse_options($options);
@@ -214,10 +213,6 @@ function subnet_add($options="") {
     // Set vlan_id to 0 initially
     $SET['vlan_id'] = 0;
 
-    // TODO: remove this column from db
-    $SET['network_role_id'] = 0;
-
-
     // Prepare options[ip] - translate IP address to a number
     $options['ip'] = $ourip = ip_mangle($options['ip'], 'numeric');
     if ($ourip == -1) {