- changes on ConfDB

sql/postgresql/intranet-confdb-create.sql

@@ -394,7 +394,7 @@ values (11920, 'Computer Network Device', 'Intranet Conf Item Type');
 insert into im_categories(category_id, category, category_type)
 values (11922, 'Computer Port', 'Intranet Conf Item Type'); 
 insert into im_categories(category_id, category, category_type)
-values (11924, 'Printer', 'Intranet Conf Item Type'); 
+values (11924, 'Computer Printer Driver', 'Intranet Conf Item Type'); 
 insert into im_categories(category_id, category, category_type)
 values (11926, 'Computer Slot', 'Intranet Conf Item Type'); 
 insert into im_categories(category_id, category, category_type)

www/index.tcl

@@ -140,11 +140,14 @@ template::list::create \
 	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Name Name]"
 	    link_url_eval {[export_vars -base new {conf_item_id {form_mode "display"}}]}
 	}
-	conf_item_nr {
-	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Nr {Nr.}]"
+        ip_address {
+	    label "[lang::message::lookup {} intranet-confdb.IP_Address IP-Address]"
 	}
-	conf_item_code {
-	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Code Code]"
+        win_workgroup {
+	    label "[lang::message::lookup {} intranet-confdb.Workgroup Workgroup]"
+	}
+        win_userdomain {
+	    label "[lang::message::lookup {} intranet-confdb.Domain Domain]"
 	}
         conf_item_type {
 	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Type Type]"
@@ -152,6 +155,30 @@ template::list::create \
         conf_item_status {
 	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Status Status]"
 	}
+        processor_speed {
+	    label "[lang::message::lookup {} intranet-confdb.Processor Processor]"
+	    display_template {
+		@conf_item_lines.processor;noquote@
+	    }
+	}
+        sys_memory {
+	    label "[lang::message::lookup {} intranet-confdb.Memory Memory]"
+	}
+        os_name {
+	    label "[lang::message::lookup {} intranet-confdb.OS OS]"
+	}
+        os_version {
+	    label "[lang::message::lookup {} intranet-confdb.OS_Version Version]"
+	}
+    }
+
+set ttt {
+	conf_item_code {
+	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Code Code]"
+	}
+	conf_item_nr {
+	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Nr {Nr.}]"
+	}
         conf_item_owner {
 	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Cost_Owner Owner]"
 	    link_url_eval {[export_vars -base "/intranet/users/view" {{user_id $conf_item_owner_id}}]}
@@ -159,8 +186,7 @@ template::list::create \
         conf_item_cost_center {
 	    label "[lang::message::lookup {} intranet-confdb.Conf_Item_Cost_Center {Cost Center}]"
 	}
-    }
-
+}
 
 
 # ---------------------------------------------------------------
@@ -186,11 +212,12 @@ set sql "
 
 
 
-db_multirow -extend {conf_item_chk return_url} conf_item_lines conf_items_lines $conf_item_sql {
-	set conf_item_chk "<input type=\"checkbox\" 
+db_multirow -extend {conf_item_chk return_url processor} conf_item_lines conf_items_lines $conf_item_sql {
+    set conf_item_chk "<input type=\"checkbox\" 
 				name=\"conf_item_id\" 
 				value=\"$conf_item_id\" 
 				id=\"conf_items_list,$conf_item_id\">"
-        set return_url [im_url_with_query]
+    set processor "${processor_num}x$processor_speed"
+    set return_url [im_url_with_query]
 }
 

www/new.tcl

@@ -76,6 +76,7 @@ ad_form \
 
 if {![info exists conf_item_type_id]} { set conf_item_type_id ""}
 set field_cnt [im_dynfield::append_attributes_to_form \
+    -form_display_mode $form_mode \
     -object_subtype_id $conf_item_type_id \
     -object_type "im_conf_item" \
     -form_id $form_id \