? 252877-execute.patch
? 319876-views.patch
Index: domain_views/domain_views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_views/domain_views.module,v
retrieving revision 1.7
diff -u -p -r1.7 domain_views.module
--- domain_views/domain_views.module	11 Oct 2008 23:18:00 -0000	1.7
+++ domain_views/domain_views.module	24 Mar 2009 21:36:20 -0000
@@ -24,6 +24,5 @@
  * Implements hook_views_api().
  */
 function domain_views_views_api() {
-
   return array('api' => 2.0);
 }
Index: domain_views/domain_views.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_views/domain_views.views.inc,v
retrieving revision 1.6
diff -u -p -r1.6 domain_views.views.inc
--- domain_views/domain_views.views.inc	6 Nov 2008 16:32:07 -0000	1.6
+++ domain_views/domain_views.views.inc	24 Mar 2009 21:36:21 -0000
@@ -187,6 +187,54 @@ function domain_views_views_data() {
       'label' => t('Available on current domain'),
     ),
   );
+  
+  // Define the {domain_editor} table.
+  $data['domain_editor']['table']['group'] = t('Domain');
+  // Define the joins.
+  $data['domain_editor']['table']['join']['users'] = array(
+    'left_field' => 'uid',
+    'field' => 'uid',
+  );
+  // Define the fields.
+  $data['domain_editor']['uid'] = array(
+    'title' => t('User ID'),
+    'help' => t('The user\'s id.'),
+    'field' => array(
+      'click sortable' => TRUE,
+    ),
+    // Information for accepting a domain_id as a filter
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    // Information for sorting on a domain_id.
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+  // Define the fields.
+  $data['domain_editor']['domain_id'] = array(
+    'title' => t('Domain ID'),
+    'help' => t('The domain id of the editor record.'),
+    'field' => array(
+      'click sortable' => TRUE,
+    ),
+    // Information for accepting a domain_id as a filter
+    'filter' => array(
+      'handler' => 'domain_views_handler_filter_domain_domain_id',
+    ),
+    // Information for sorting on a domain_id.
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'relationship' => array(
+      'title' => t('Domain editors'),
+      'help' => t("Bring in information about the domain this user is assigned to."),
+      'base' => 'domain',
+      'field' => 'domain_id',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Domain editors'),
+    ),
+  );
   return $data;
 }
 
Index: domain_views/includes/domain_views_handler_filter_domain_access_gid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_views/includes/domain_views_handler_filter_domain_access_gid.inc,v
retrieving revision 1.1
diff -u -p -r1.1 domain_views_handler_filter_domain_access_gid.inc
--- domain_views/includes/domain_views_handler_filter_domain_access_gid.inc	6 Nov 2008 16:32:07 -0000	1.1
+++ domain_views/includes/domain_views_handler_filter_domain_access_gid.inc	24 Mar 2009 21:36:21 -0000
@@ -12,12 +12,12 @@ class domain_views_handler_filter_domain
   function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Domain');
-      $domain_options = array('-1' => t('Any domain -- use with "Is not one of"'), '***CURRENT_DOMAIN***' => t('Current Domain'));
+      $domain_options = array('***CURRENT_DOMAIN***' => t('Current Domain'));
       $domains = domain_domains();
       foreach ($domains as $domain) {
-        $domain_options[$domain['domain_id']] = $domain['sitename'];
+        $domain_options[$domain['domain_id']] = filter_xss_admin($domain['sitename']);
         }
       $this->value_options = $domain_options;
     }
   }
-}
\ No newline at end of file
+}
Index: domain_views/includes/domain_views_handler_filter_domain_domain_id.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_views/includes/domain_views_handler_filter_domain_domain_id.inc,v
retrieving revision 1.1
diff -u -p -r1.1 domain_views_handler_filter_domain_domain_id.inc
--- domain_views/includes/domain_views_handler_filter_domain_domain_id.inc	6 Nov 2008 16:32:07 -0000	1.1
+++ domain_views/includes/domain_views_handler_filter_domain_domain_id.inc	24 Mar 2009 21:36:21 -0000
@@ -13,12 +13,12 @@ class domain_views_handler_filter_domain
   function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Domain');
-      $domain_options = array('-1' => t('Any domain -- use with "Is not one of"'), '***CURRENT_DOMAIN***' => t('Current Domain'));
+      $domain_options = array('***CURRENT_DOMAIN***' => t('Current Domain'));
       $domains = domain_domains();
       foreach ($domains as $domain) {
-        $domain_options[$domain['domain_id']] = $domain['sitename'];
+        $domain_options[$domain['domain_id']] = filter_xss_admin($domain['sitename']);
         }
       $this->value_options = $domain_options;
     }
   }
-}
\ No newline at end of file
+}