Issue #4: ensure flag config and sample views handled properly (#48)

flag.module

@@ -18,6 +18,11 @@ function flag_config_info() {
     'label' => t('Flag settings'),
     'group' => t('Configuration'),
   );
+  $prefixes['flag.flag'] = array(
+    'name_key' => 'name',
+    'label_key' => 'title',
+    'group' => t('Flags'),
+  );
   return $prefixes;
 }
 

modules/flag_bookmark/flag_bookmark.install

@@ -52,6 +52,20 @@ function flag_bookmark_enable() {
   }
 }
 
+/**
+ * Implements hook_uninstall().
+ */
+function flag_bookmark_uninstall() {
+  // Remove default, un-modified views.
+  foreach (array('flag_bookmarks', 'flag_bookmarks_tab') as $view) {
+    $config = config('views.view.' . $view);
+    // Only update if view isn't overridden (VIEWS_STORAGE_OVERRIDE).
+    if ($config->get('storage') != 2) {
+      $config->delete();
+    }
+  }
+}
+
 /**
  * Returns some node types to which the demonstration 'bookmarks' flag will
  * apply.
@@ -260,7 +274,7 @@ function flag_bookmark_update_1000() {
         ),
       )
     );
-    $config->save();    
+    $config->save();
   }
 
   $config = config('views.view.flag_bookmarks');
@@ -432,4 +446,4 @@ function flag_bookmark_update_1000() {
     );
     $config->save();
   }
-}
+}