Updating features

diff --git a/features/muamba_interface/muamba_interface.views_default.inc b/features/muamba_interface/muamba_interface.views_default.inc
index 24b52bb0f717584b99d1842745c9e2b23d511f12..4c839d9299eb835114cb1ca7eba8036eace597d2 100644 (file)
--- a/features/muamba_interface/muamba_interface.views_default.inc
+++ b/features/muamba_interface/muamba_interface.views_default.inc
@@ -134,6 +134,10 @@ function muamba_interface_views_default_views() {
   /* Display: Minhas */
   $handler = $view->new_display('page', 'Minhas', 'page');
   $handler->display->display_options['display_description'] = 'Minhas muambas';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    0 => 'AND',
+    1 => 'OR',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Conteúdo: Publicado */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -149,12 +153,30 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'muamba' => 'muamba',
   );
+  $handler->display->display_options['filters']['type']['group'] = 0;
   /* Filter criterion: Usuário: Atual */
   $handler->display->display_options['filters']['uid_current']['id'] = 'uid_current';
   $handler->display->display_options['filters']['uid_current']['table'] = 'users';
   $handler->display->display_options['filters']['uid_current']['field'] = 'uid_current';
   $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
   $handler->display->display_options['filters']['uid_current']['value'] = '1';
+  $handler->display->display_options['filters']['uid_current']['group'] = 0;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
+  $handler->display->display_options['filters']['status_1']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_1']['field'] = 'status';
+  $handler->display->display_options['filters']['status_1']['operator'] = 'not in';
+  $handler->display->display_options['filters']['status_1']['value'] = array(
+    2 => '2',
+    3 => '3',
+  );
+  $handler->display->display_options['filters']['status_1']['group'] = 1;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_2']['id'] = 'status_2';
+  $handler->display->display_options['filters']['status_2']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_2']['field'] = 'status';
+  $handler->display->display_options['filters']['status_2']['operator'] = 'empty';
+  $handler->display->display_options['filters']['status_2']['group'] = 1;
   $handler->display->display_options['path'] = 'muambas';
 
   /* Display: Minhas (bloco) */
@@ -174,6 +196,10 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['defaults']['row_plugin'] = FALSE;
   $handler->display->display_options['row_plugin'] = 'fields';
   $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    0 => 'AND',
+    1 => 'OR',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Conteúdo: Publicado */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -189,12 +215,30 @@ function muamba_interface_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'muamba' => 'muamba',
   );
+  $handler->display->display_options['filters']['type']['group'] = 0;
   /* Filter criterion: Usuário: Atual */
   $handler->display->display_options['filters']['uid_current']['id'] = 'uid_current';
   $handler->display->display_options['filters']['uid_current']['table'] = 'users';
   $handler->display->display_options['filters']['uid_current']['field'] = 'uid_current';
   $handler->display->display_options['filters']['uid_current']['relationship'] = 'uid';
   $handler->display->display_options['filters']['uid_current']['value'] = '1';
+  $handler->display->display_options['filters']['uid_current']['group'] = 0;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
+  $handler->display->display_options['filters']['status_1']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_1']['field'] = 'status';
+  $handler->display->display_options['filters']['status_1']['operator'] = 'not in';
+  $handler->display->display_options['filters']['status_1']['value'] = array(
+    2 => '2',
+    3 => '3',
+  );
+  $handler->display->display_options['filters']['status_1']['group'] = 1;
+  /* Filter criterion: Muamba: Status */
+  $handler->display->display_options['filters']['status_2']['id'] = 'status_2';
+  $handler->display->display_options['filters']['status_2']['table'] = 'muamba';
+  $handler->display->display_options['filters']['status_2']['field'] = 'status';
+  $handler->display->display_options['filters']['status_2']['operator'] = 'empty';
+  $handler->display->display_options['filters']['status_2']['group'] = 1;
 
   /* Display: Disponíveis (bloco) */
   $handler = $view->new_display('block', 'Disponíveis (bloco)', 'block_1');
@@ -1826,7 +1870,7 @@ function muamba_interface_views_default_views() {
   /* Display: Pedi */
   $handler = $view->new_display('block', 'Pedi', 'block_1');
   $handler->display->display_options['defaults']['title'] = FALSE;
-  $handler->display->display_options['title'] = 'Coisas que pedi';
+  $handler->display->display_options['title'] = 'Muambas que pedi';
   $handler->display->display_options['display_description'] = 'Muambas que pedi';
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'table';
@@ -2071,7 +2115,7 @@ function muamba_interface_views_default_views() {
   /* Display: Me pediram */
   $handler = $view->new_display('block', 'Me pediram', 'block_2');
   $handler->display->display_options['defaults']['title'] = FALSE;
-  $handler->display->display_options['title'] = 'Coisas que me pediram';
+  $handler->display->display_options['title'] = 'Muambas que me pediram';
   $handler->display->display_options['display_description'] = 'Muambas que me pediram';
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'table';
@@ -2337,11 +2381,9 @@ function muamba_interface_views_default_views() {
     t('Ativas'),
     t('Geral'),
     t('Pedi'),
-    t('Coisas que pedi'),
     t('Muambas que pedi'),
     t('Última atualização'),
     t('Me pediram'),
-    t('Coisas que me pediram'),
     t('Muambas que me pediram'),
   );
   $export['transacoes'] = $view;