From 534bc3bca3fe5f117cb51611210fdb4cfe2c9e37 Mon Sep 17 00:00:00 2001
From: Jorrit Schippers <jorrit@161217.no-reply.drupal.org>
Date: Thu, 19 Jul 2012 22:04:46 +0200
Subject: [PATCH] Issue #1673434 by Jorrit: Fixed list of selectable views to only consider enabled views and to consider subviews if they don't override the style plugin property.

---
 relation_select.module |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/relation_select.module b/relation_select.module
index a501b9e..63a7af8 100644
--- a/relation_select.module
+++ b/relation_select.module
@@ -882,9 +882,13 @@ function relation_select_ajax(){
  */
 function relation_select_get_views(){
   $views = array();
-  foreach(views_get_all_views() as $name => $view){
+  foreach(views_get_enabled_views() as $name => $view) {
     foreach(array_keys($view->display) as $id){
-      if($view->human_name && isset($view->display[$id]->display_options['style_plugin']) && $view->display[$id]->display_options['style_plugin'] == 'relation_select'){
+      $styleplugin = $view->display['default']->display_options['style_plugin'];
+      if ($id != 'default' && isset($view->display[$id]->display_options['style_plugin'])) {
+        $styleplugin = $view->display[$id]->display_options['style_plugin'];
+      }
+      if($view->human_name && $styleplugin == 'relation_select') {
         $views[$name . ':' . $id] = $view->human_name . ' : ' . $view->display[$id]->display_title;
       }
     }
-- 
1.7.4.1

