From 92e4de8824264e32c8176be5b8b76258d1778b70 Mon Sep 17 00:00:00 2001
From: Ron Shimshock <ron@shimshockgroup.com>
Date: Sun, 7 Aug 2016 03:35:21 -0500
Subject: [PATCH] Integrity constraint violation error

---
 bean_admin_ui/bean_admin_ui.admin.inc      | 4 ++--
 bean_admin_ui/plugins/BeanCustom.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bean_admin_ui/bean_admin_ui.admin.inc b/bean_admin_ui/bean_admin_ui.admin.inc
index 3340b80..15e76dd 100644
--- a/bean_admin_ui/bean_admin_ui.admin.inc
+++ b/bean_admin_ui/bean_admin_ui.admin.inc
@@ -82,7 +82,7 @@ function bean_admin_ui_type_form($form, &$form_state, $bean_type = NULL) {
 
     $bean_type = new BeanCustom($plugin_info);
   }
-  elseif (!method_exists($bean_type, 'getExportStatus') || $bean_type->getExportStatus() == 'Normal') {
+  elseif (!method_exists($bean_type, 'getExportStatus') || in_array($bean_type->getExportStatus(), array(t('Normal'), t('Overridden')))) {
     $form['new'] = array(
       '#type' => 'value',
       '#value' => FALSE,
@@ -127,7 +127,7 @@ function bean_admin_ui_type_form($form, &$form_state, $bean_type = NULL) {
       'source' => array('label'),
     ),
     '#description' => t('A unique machine-readable name for this block type. It must only contain lowercase letters, numbers, and underscores.'),
-    '#disabled' => $disabled,
+    '#disabled' => $disabled || $bean_type->getExportStatus() == t('Overridden'),
   );
 
   $form['actions'] = array('#type' => 'actions');
diff --git a/bean_admin_ui/plugins/BeanCustom.class.php b/bean_admin_ui/plugins/BeanCustom.class.php
index e64f0b5..63c1069 100644
--- a/bean_admin_ui/plugins/BeanCustom.class.php
+++ b/bean_admin_ui/plugins/BeanCustom.class.php
@@ -53,7 +53,7 @@ class BeanCustom extends BeanPlugin {
    * Get the export status
    */
   public function getExportStatus() {
-    return $this->plugin_info['export_status'];
+    return isset($this->plugin_info['export_status']) ? $this->plugin_info['export_status'] : NULL;
   }
 
   /**
-- 
2.9.2