Index: flexinode.install =================================================================== RCS file: /cvs/drupal/contributions/modules/flexinode/flexinode.install,v retrieving revision 1.2.2.2 diff -u -r1.2.2.2 flexinode.install --- C:\Documents and Settings\Aldo\Local Settings\Temp\TCV7367.tmp\flexinode.1.2.2.2.install Wed Apr 18 21:14:05 2007 +++ D:\drupal cvs\4.7.x\contributions\modules\flexinode\flexinode.install Wed Apr 18 21:04:00 2007 @@ -29,7 +29,6 @@ ctype_id int(10) unsigned NOT NULL default '0', name varchar(255) NOT NULL default '', description varchar(255) NOT NULL default '', - help text NOT NULL, PRIMARY KEY ctype_id (ctype_id) ) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */;"); @@ -101,3 +100,18 @@ return _system_update_utf8(array('flexinode_data', 'flexinode_field', 'flexinode_type')); } +function flexinode_update_2() { + $items = array(); + + // Move helptext into variable for each flexinode type + $sql = "SELECT ctype_id, help FROM {flexinode_type}"; + $result = db_query($sql); + $items[] = array('success' => $result !== FALSE, 'query' => check_plain($sql)); + while ($ctype = db_fetch_object($result)) { + variable_set("flexinode-$ctype->ctype_id_help", variable_get("flexinode-$ctype->ctype_id_help",'').$ctype->help); + } + + // Drop the 'help' column. Works for both PostgreSQL and MySQL + $items[] = update_sql("ALTER TABLE {flexinode_type} DROP help"); + return $items; +} \ No newline at end of file Index: flexinode_admin.module =================================================================== RCS file: /cvs/drupal/contributions/modules/flexinode/flexinode_admin.module,v retrieving revision 1.5.2.2 diff -u -r1.5.2.2 flexinode_admin.module --- flexinode_admin.module 17 Apr 2007 13:20:28 -0000 1.5.2.2 +++ flexinode_admin.module 18 Apr 2007 19:12:18 -0000 @@ -258,14 +258,6 @@ '#maxlength' => 128, '#description' => t('A one-line description of the content type.'), ); - $form['help'] = array( - '#type' => 'textarea', - '#title' => t('Help text'), - '#default_value' => $ctype->help, - '#size' => 60, - '#maxlength' => 5, - '#description' => t('Instructions to present to the user when adding new content of this type.'), - ); $form['ctype_id'] = array('#type' => 'hidden', '#value' => $ctype_id); $form['submit'] = array('#type' => 'submit', '#value' => t('Submit')); @@ -297,14 +283,14 @@ $former_ctype = flexinode_load_content_type($ctype_id); - db_query("UPDATE {flexinode_type} SET name = '%s', description = '%s', help = '%s' WHERE ctype_id = %d", $edit['name'], $edit['description'], $edit['help'], $ctype_id); + db_query("UPDATE {flexinode_type} SET name = '%s', description = '%s' WHERE ctype_id = %d", $edit['name'], $edit['description'], $ctype_id); drupal_set_message(t('updated content type "%name".', array('%name' => $edit['name']))); } else { $ctype_id = db_next_id('{flexinode_ctype}'); - db_query("INSERT INTO {flexinode_type} (name, description, help, ctype_id) VALUES ('%s', '%s', '%s', %d)", $edit['name'], $edit['description'], $edit['help'], $ctype_id); + db_query("INSERT INTO {flexinode_type} (name, description, ctype_id) VALUES ('%s', '%s', %d)", $edit['name'], $edit['description'], $ctype_id); drupal_set_message(t('created new content type "%name".', array('%name' => $edit['name']))); }