' . format_plural($num_beans, '%type is used by 1 block on your site. If you remove this block type, you will not be able to edit the %type blocks and it may not display correctly.', '%type is used by @count pieces of content on your site. If you remove %type, you will not be able to edit the %type content and it may not display correctly.', array('%type' => $type->getLabel())) . '
'; + if (!method_exists($type, 'getExportStatus') || $type->getExportStatus() == 'Normal') { + $message = t('Are you sure you want to delete the block type %type?', array('%type' => $type->getLabel())); + $num_beans = db_query("SELECT COUNT(*) FROM {bean} WHERE type = :type", array(':type' => $type->type))->fetchField(); + if ($num_beans) { + $caption .= '' . format_plural($num_beans, '%type is used by 1 block on your site. If you remove this block type, you will not be able to edit the %type blocks and it may not display correctly.', '%type is used by @count pieces of content on your site. If you remove %type, you will not be able to edit the %type content and it may not display correctly.', array('%type' => $type->getLabel())) . '
'; + } + $action = t('Delete'); + } + else { + $message = t('Are you sure you want to revert the block type %type?', array('%type' => $type->getLabel())); + $action = t('Revert'); } - $caption .= '' . t('This action cannot be undone.') . '
'; - return confirm_form($form, $message, 'admin/structure/block/types', $caption, t('Delete')); + return confirm_form($form, $message, 'admin/structure/block/types', $caption, $action); } function bean_admin_ui_type_delete_confirm_submit($form, &$form_state) { diff --git a/bean_admin_ui/bean_admin_ui.install b/bean_admin_ui/bean_admin_ui.install index 0d9831a..5c76c27 100644 --- a/bean_admin_ui/bean_admin_ui.install +++ b/bean_admin_ui/bean_admin_ui.install @@ -11,8 +11,27 @@ function bean_admin_ui_schema() { $schema['bean_type'] = array( 'description' => 'Stores information about all defined bean types.', + 'export' => array( + 'key' => 'name', + 'identifier' => 'bean_type', + 'default hook' => 'bean_admin_ui_types', + 'admin_title' => 'label', + 'api' => array( + 'owner' => 'bean_admin_ui', + 'api' => 'bean', + 'minimum_version' => 1, + 'current_version' => 1, + ), + ), 'fields' => array( - 'type' => array( + 'type_id' => array( + 'description' => 'The Type ID of this block. Only used internally by CTools', + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'no export' => TRUE, + ), + 'name' => array( 'description' => 'The machine-readable name of this bean type.', 'type' => 'varchar', 'length' => 32, @@ -25,9 +44,61 @@ function bean_admin_ui_schema() { 'not null' => TRUE, 'default' => '', ), + 'options' => array( + 'description' => 'Block content configuration.', + 'type' => 'text', + 'size' => 'big', + ), + ), + 'primary key' => array('type_id'), + 'unique keys' => array( + 'name' => array('name'), ), - 'primary key' => array('type'), ); - return $schema; -} \ No newline at end of file +} + +/** + * Add support for CTools exportables. + */ +function bean_admin_ui_update_7001() { + db_drop_primary_key('bean_type'); + + // Add a type_id column for use by CTools. + $spec = array( + 'description' => 'The Type ID of this block. Only used internally by CTools', + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'no export' => TRUE, + ); + $new_keys = array( + 'primary key' => array('type_id'), + ); + db_add_field('bean_type', 'type_id', $spec, $new_keys); + + // Add the options column. + $spec = array( + 'description' => 'Block content configuration.', + 'type' => 'text', + 'size' => 'big', + ); + db_add_field('bean_type', 'options', $spec); + + // Adjust the type column so tat it doesn't clash with CTools. + $spec = array( + 'description' => 'The machine-readable name of this bean type.', + 'type' => 'varchar', + 'length' => 32, + 'not null' => TRUE, + ); + $new_keys = array( + 'unique keys' => array( + 'name' => array('name'), + ), + ); + db_change_field('bean_type', 'type', 'name', $spec, $new_keys); + + cache_clear_all(); + return t('Added new fields required for CTools exportable support.'); +} diff --git a/bean_admin_ui/bean_admin_ui.module b/bean_admin_ui/bean_admin_ui.module index 51d4ea6..64af14c 100644 --- a/bean_admin_ui/bean_admin_ui.module +++ b/bean_admin_ui/bean_admin_ui.module @@ -85,12 +85,13 @@ function bean_admin_ui_bean_types() { $bean_types = bean_admin_ui_get_types(); foreach ($bean_types as $bean_type) { - $plugins[$bean_type->type] = array( + $plugins[$bean_type->name] = array( 'label' => $bean_type->label, - 'type' => $bean_type->type, + 'type' => $bean_type->name, + 'export_status' => $bean_type->type, ); - $plugins[$bean_type->type] += _bean_admin_default_plugin(); + $plugins[$bean_type->name] += _bean_admin_default_plugin(); } return $plugins; @@ -105,7 +106,8 @@ function bean_admin_ui_get_types() { if (empty($bean_types)) { $cache = cache_get('bean_types'); if (empty($cache->data)) { - $bean_types = db_query('SELECT * FROM {bean_type}')->fetchAllAssoc('type'); + ctools_include('export'); + $bean_types = ctools_export_load_object('bean_type'); cache_set('bean_types', $bean_types); } else { diff --git a/bean_admin_ui/plugins/custom.inc b/bean_admin_ui/plugins/custom.inc index 8998153..5af4ebd 100644 --- a/bean_admin_ui/plugins/custom.inc +++ b/bean_admin_ui/plugins/custom.inc @@ -9,22 +9,21 @@ * DO NOT USE THIS BEAN. ONLY USED FOR THE UI PLUGINS */ class bean_custom extends bean_plugin { - /** * Delete the record from the database. */ public function delete() { - db_delete('bean') + // Delete all beans belonging to this bean type if we are removing + // the actual bean. + if ($this->getExportStatus() == 'Normal') { + db_delete('bean') ->condition('type', $this->type) ->execute(); - - // Delete all fo the beans + } db_delete('bean_type') - ->condition('type', $this->type) - ->execute(); - + ->condition('name', $this->type) + ->execute(); field_attach_delete_bundle('bean', $this->type); - drupal_flush_all_caches(); } @@ -33,16 +32,20 @@ class bean_custom extends bean_plugin { */ public function save($new = FALSE) { $bean_type = array( - 'type' => $this->type, + 'name' => $this->type, 'label' => $this->getLabel(), ); - $primary_key = $new == FALSE ? 'type' : array(); + $primary_key = $new == FALSE ? 'name' : array(); drupal_write_record('bean_type', $bean_type, $primary_key); drupal_static_reset('bean_admin_ui_get_types'); bean_reset(); } + + public function getExportStatus() { + return $this->plugin_info['export_status']; + } /** * Set the label diff --git a/includes/bean.core.inc b/includes/bean.core.inc index fdcd385..b8ac7f5 100644 --- a/includes/bean.core.inc +++ b/includes/bean.core.inc @@ -23,7 +23,6 @@ class Bean extends Entity { public function __construct($values = array()) { parent::__construct($values, 'bean'); - // Load the plugin info // NOTE: When this is caalled as part of entity_load, $values seems to be // empty, which makes it impossible to load the plugin and field data.