Mercurial > hg > rr-repo

changeset 28:9b58e6b687c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed user permissions
author root <root@guanciale.(none)>
date Mon, 09 Dec 2013 12:31:37 +0000
parents 56d0fe6b6acb
children 11991bef8cf2
files rrr_features.features.field_instance.inc rrr_features.features.inc rrr_features.features.menu_links.inc rrr_features.features.user_permission.inc rrr_features.views_default.inc
diffstat 5 files changed, 120 insertions(+), 101 deletions(-) [+]
line wrap: on
line diff
--- a/rrr_features.features.field_instance.inc	Mon Dec 09 12:08:10 2013 +0000
+++ b/rrr_features.features.field_instance.inc	Mon Dec 09 12:31:37 2013 +0000
@@ -134,16 +134,6 @@
       'active' => 1,
       'module' => 'image',
       'settings' => array(
-        'insert' => 0,
-        'insert_absolute' => FALSE,
-        'insert_class' => '',
-        'insert_default' => array(
-          0 => 'auto',
-        ),
-        'insert_styles' => array(
-          0 => 'auto',
-        ),
-        'insert_width' => '',
         'preview_image_style' => 'thumbnail',
         'progress_indicator' => 'throbber',
       ),
--- a/rrr_features.features.inc	Mon Dec 09 12:08:10 2013 +0000
+++ b/rrr_features.features.inc	Mon Dec 09 12:31:37 2013 +0000
@@ -19,7 +19,7 @@
     'page' => array(
       'name' => t('static page'),
       'base' => 'node_content',
-      'description' => t('Use <em>basic pages</em> for your static content, such as an \'About us\' page.'),
+      'description' => t('a static page used for contacts, about us, welcome page, etc.'),
       'has_title' => '1',
       'title_label' => t('Title'),
       'help' => '',
--- a/rrr_features.features.menu_links.inc	Mon Dec 09 12:08:10 2013 +0000
+++ b/rrr_features.features.menu_links.inc	Mon Dec 09 12:31:37 2013 +0000
@@ -52,7 +52,9 @@
     'link_title' => 'Home',
     'options' => array(
       'identifier' => 'main-menu_home:<front>',
-      'attributes' => array(),
+      'attributes' => array(
+        'title' => '',
+      ),
     ),
     'module' => 'menu',
     'hidden' => 0,
@@ -745,7 +747,7 @@
     'link_title' => 'Module filter',
     'options' => array(
       'attributes' => array(
-        'title' => 'Configure settings for Module Filter.',
+        'title' => 'Configure how the modules page looks and acts.',
       ),
       'identifier' => 'management_module-filter:admin/config/user-interface/modulefilter',
     ),
--- a/rrr_features.features.user_permission.inc	Mon Dec 09 12:08:10 2013 +0000
+++ b/rrr_features.features.user_permission.inc	Mon Dec 09 12:31:37 2013 +0000
@@ -34,7 +34,10 @@
   // Exported permission: 'access biblio content'.
   $permissions['access biblio content'] = array(
     'name' => 'access biblio content',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -72,7 +75,9 @@
   // Exported permission: 'access user profiles'.
   $permissions['access user profiles'] = array(
     'name' => 'access user profiles',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'user',
   );
 
@@ -86,7 +91,9 @@
   // Exported permission: 'administer biblio'.
   $permissions['administer biblio'] = array(
     'name' => 'administer biblio',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -261,7 +268,9 @@
   // Exported permission: 'cancel account'.
   $permissions['cancel account'] = array(
     'name' => 'cancel account',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'user',
   );
 
@@ -275,7 +284,9 @@
   // Exported permission: 'create biblio content'.
   $permissions['create biblio content'] = array(
     'name' => 'create biblio content',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'node',
   );
 
@@ -310,7 +321,9 @@
   // Exported permission: 'delete own biblio content'.
   $permissions['delete own biblio content'] = array(
     'name' => 'delete own biblio content',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'node',
   );
 
@@ -345,7 +358,9 @@
   // Exported permission: 'edit any biblio content'.
   $permissions['edit any biblio content'] = array(
     'name' => 'edit any biblio content',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'node',
   );
 
@@ -359,7 +374,9 @@
   // Exported permission: 'edit biblio authors'.
   $permissions['edit biblio authors'] = array(
     'name' => 'edit biblio authors',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -373,7 +390,9 @@
   // Exported permission: 'edit own biblio content'.
   $permissions['edit own biblio content'] = array(
     'name' => 'edit own biblio content',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'node',
   );
 
@@ -401,7 +420,9 @@
   // Exported permission: 'import from file'.
   $permissions['import from file'] = array(
     'name' => 'import from file',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -436,21 +457,30 @@
   // Exported permission: 'show download links'.
   $permissions['show download links'] = array(
     'name' => 'show download links',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
   // Exported permission: 'show export links'.
   $permissions['show export links'] = array(
     'name' => 'show export links',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
   // Exported permission: 'show filter tab'.
   $permissions['show filter tab'] = array(
     'name' => 'show filter tab',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -464,7 +494,10 @@
   // Exported permission: 'show sort links'.
   $permissions['show sort links'] = array(
     'name' => 'show sort links',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -478,23 +511,27 @@
   // Exported permission: 'use text format full_html'.
   $permissions['use text format full_html'] = array(
     'name' => 'use text format full_html',
-    'roles' => array(
-      'authenticated user' => 'authenticated user',
-    ),
+    'roles' => array(),
     'module' => 'filter',
   );
 
   // Exported permission: 'view disqus comments'.
   $permissions['view disqus comments'] = array(
     'name' => 'view disqus comments',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'disqus',
   );
 
   // Exported permission: 'view full text'.
   $permissions['view full text'] = array(
     'name' => 'view full text',
-    'roles' => array(),
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'biblio',
   );
 
@@ -508,7 +545,9 @@
   // Exported permission: 'view revisions'.
   $permissions['view revisions'] = array(
     'name' => 'view revisions',
-    'roles' => array(),
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
     'module' => 'node',
   );
 
--- a/rrr_features.views_default.inc	Mon Dec 09 12:08:10 2013 +0000
+++ b/rrr_features.views_default.inc	Mon Dec 09 12:31:37 2013 +0000
@@ -12,7 +12,7 @@
 
   $view = new view();
   $view->name = 'related_experiments';
-  $view->description = 'A view listing experiments that use the current resource';
+  $view->description = 'displays experiments related to the current resource';
   $view->tag = 'default';
   $view->base_table = 'node';
   $view->human_name = 'Related experiments';
@@ -28,41 +28,52 @@
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['exposed_form']['type'] = 'basic';
-  $handler->display->display_options['pager']['type'] = 'none';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '5';
   $handler->display->display_options['style_plugin'] = 'grid';
   $handler->display->display_options['style_options']['columns'] = '3';
   $handler->display->display_options['row_plugin'] = 'fields';
-  $handler->display->display_options['row_options']['hide_empty'] = TRUE;
   /* Footer: Global: Result summary */
   $handler->display->display_options['footer']['result']['id'] = 'result';
   $handler->display->display_options['footer']['result']['table'] = 'views';
   $handler->display->display_options['footer']['result']['field'] = 'result';
-  /* Relationship: Broken/missing handler */
-  $handler->display->display_options['relationships']['reverse_field_resource_publications_node']['id'] = 'reverse_field_resource_publications_node';
-  $handler->display->display_options['relationships']['reverse_field_resource_publications_node']['table'] = 'node';
-  $handler->display->display_options['relationships']['reverse_field_resource_publications_node']['field'] = 'reverse_field_resource_publications_node';
-  $handler->display->display_options['relationships']['reverse_field_resource_publications_node']['label'] = 'field_resource_publications';
+  /* Relationship: Content: Dataset (field_dataset) - reverse */
+  $handler->display->display_options['relationships']['reverse_field_dataset_node']['id'] = 'reverse_field_dataset_node';
+  $handler->display->display_options['relationships']['reverse_field_dataset_node']['table'] = 'node';
+  $handler->display->display_options['relationships']['reverse_field_dataset_node']['field'] = 'reverse_field_dataset_node';
+  /* Relationship: Content: Experiment (field_experiment) - reverse */
+  $handler->display->display_options['relationships']['reverse_field_experiment_node']['id'] = 'reverse_field_experiment_node';
+  $handler->display->display_options['relationships']['reverse_field_experiment_node']['table'] = 'node';
+  $handler->display->display_options['relationships']['reverse_field_experiment_node']['field'] = 'reverse_field_experiment_node';
+  /* Relationship: Content: Publication (field_publication) - reverse */
+  $handler->display->display_options['relationships']['reverse_field_publication_node']['id'] = 'reverse_field_publication_node';
+  $handler->display->display_options['relationships']['reverse_field_publication_node']['table'] = 'node';
+  $handler->display->display_options['relationships']['reverse_field_publication_node']['field'] = 'reverse_field_publication_node';
+  /* Relationship: Content: Software (field_software) - reverse */
+  $handler->display->display_options['relationships']['reverse_field_software_node']['id'] = 'reverse_field_software_node';
+  $handler->display->display_options['relationships']['reverse_field_software_node']['table'] = 'node';
+  $handler->display->display_options['relationships']['reverse_field_software_node']['field'] = 'reverse_field_software_node';
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['relationship'] = 'reverse_field_dataset_node';
+  $handler->display->display_options['fields']['title']['label'] = '';
+  $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title_1']['id'] = 'title_1';
+  $handler->display->display_options['fields']['title_1']['table'] = 'node';
+  $handler->display->display_options['fields']['title_1']['field'] = 'title';
+  $handler->display->display_options['fields']['title_1']['relationship'] = 'reverse_field_publication_node';
+  $handler->display->display_options['fields']['title_1']['label'] = '';
+  $handler->display->display_options['fields']['title_1']['element_label_colon'] = FALSE;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title_2']['id'] = 'title_2';
   $handler->display->display_options['fields']['title_2']['table'] = 'node';
   $handler->display->display_options['fields']['title_2']['field'] = 'title';
-  $handler->display->display_options['fields']['title_2']['relationship'] = 'reverse_field_dataset_node';
+  $handler->display->display_options['fields']['title_2']['relationship'] = 'reverse_field_software_node';
   $handler->display->display_options['fields']['title_2']['label'] = '';
   $handler->display->display_options['fields']['title_2']['element_label_colon'] = FALSE;
-  /* Field: Content: Title */
-  $handler->display->display_options['fields']['title']['id'] = 'title';
-  $handler->display->display_options['fields']['title']['table'] = 'node';
-  $handler->display->display_options['fields']['title']['field'] = 'title';
-  $handler->display->display_options['fields']['title']['relationship'] = 'reverse_field_software_node';
-  $handler->display->display_options['fields']['title']['label'] = '';
-  $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  /* Field: Content: Title */
-  $handler->display->display_options['fields']['title_3']['id'] = 'title_3';
-  $handler->display->display_options['fields']['title_3']['table'] = 'node';
-  $handler->display->display_options['fields']['title_3']['field'] = 'title';
-  $handler->display->display_options['fields']['title_3']['relationship'] = 'reverse_field_publication_node';
-  $handler->display->display_options['fields']['title_3']['label'] = '';
-  $handler->display->display_options['fields']['title_3']['element_label_colon'] = FALSE;
   /* Field: Content: Image */
   $handler->display->display_options['fields']['field_image']['id'] = 'field_image';
   $handler->display->display_options['fields']['field_image']['table'] = 'field_data_field_image';
@@ -73,48 +84,48 @@
   $handler->display->display_options['fields']['field_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_image']['settings'] = array(
     'image_style' => 'medium',
-    'image_link' => '',
+    'image_link' => 'content',
   );
   /* Field: Content: Image */
   $handler->display->display_options['fields']['field_image_1']['id'] = 'field_image_1';
   $handler->display->display_options['fields']['field_image_1']['table'] = 'field_data_field_image';
   $handler->display->display_options['fields']['field_image_1']['field'] = 'field_image';
-  $handler->display->display_options['fields']['field_image_1']['relationship'] = 'reverse_field_software_node';
+  $handler->display->display_options['fields']['field_image_1']['relationship'] = 'reverse_field_publication_node';
   $handler->display->display_options['fields']['field_image_1']['label'] = '';
   $handler->display->display_options['fields']['field_image_1']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_image_1']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_image_1']['settings'] = array(
     'image_style' => 'medium',
-    'image_link' => '',
+    'image_link' => 'content',
   );
   /* Field: Content: Image */
   $handler->display->display_options['fields']['field_image_2']['id'] = 'field_image_2';
   $handler->display->display_options['fields']['field_image_2']['table'] = 'field_data_field_image';
   $handler->display->display_options['fields']['field_image_2']['field'] = 'field_image';
-  $handler->display->display_options['fields']['field_image_2']['relationship'] = 'reverse_field_publication_node';
+  $handler->display->display_options['fields']['field_image_2']['relationship'] = 'reverse_field_software_node';
   $handler->display->display_options['fields']['field_image_2']['label'] = '';
   $handler->display->display_options['fields']['field_image_2']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_image_2']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_image_2']['settings'] = array(
     'image_style' => 'medium',
-    'image_link' => '',
+    'image_link' => 'content',
   );
   /* Sort criterion: Content: Title */
   $handler->display->display_options['sorts']['title']['id'] = 'title';
   $handler->display->display_options['sorts']['title']['table'] = 'node';
   $handler->display->display_options['sorts']['title']['field'] = 'title';
   /* Contextual filter: Content: Nid */
-  $handler->display->display_options['arguments']['nid']['id'] = 'nid';
-  $handler->display->display_options['arguments']['nid']['table'] = 'node';
-  $handler->display->display_options['arguments']['nid']['field'] = 'nid';
-  $handler->display->display_options['arguments']['nid']['default_action'] = 'default';
-  $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'node';
-  $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['nid']['specify_validation'] = TRUE;
-  $handler->display->display_options['arguments']['nid']['validate']['type'] = 'node';
-  $handler->display->display_options['arguments']['nid']['validate_options']['types'] = array(
+  $handler->display->display_options['arguments']['nid_1']['id'] = 'nid_1';
+  $handler->display->display_options['arguments']['nid_1']['table'] = 'node';
+  $handler->display->display_options['arguments']['nid_1']['field'] = 'nid';
+  $handler->display->display_options['arguments']['nid_1']['default_action'] = 'default';
+  $handler->display->display_options['arguments']['nid_1']['default_argument_type'] = 'node';
+  $handler->display->display_options['arguments']['nid_1']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['nid_1']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['nid_1']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['nid_1']['specify_validation'] = TRUE;
+  $handler->display->display_options['arguments']['nid_1']['validate']['type'] = 'node';
+  $handler->display->display_options['arguments']['nid_1']['validate_options']['types'] = array(
     'biblio' => 'biblio',
   );
   /* Filter criterion: Content: Published */
@@ -124,37 +135,10 @@
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Biblio: Type of Publication */
-  $handler->display->display_options['filters']['tid']['id'] = 'tid';
-  $handler->display->display_options['filters']['tid']['table'] = 'biblio_types';
-  $handler->display->display_options['filters']['tid']['field'] = 'tid';
-  $handler->display->display_options['filters']['tid']['group_type'] = 'count';
-  $handler->display->display_options['filters']['tid']['operator'] = 'not in';
-  $handler->display->display_options['filters']['tid']['value'] = array(
-    'min' => '',
-    'max' => '',
-    'value' => '',
-    1000 => '1000',
-  );
-  $handler->display->display_options['filters']['tid']['group'] = 1;
 
   /* Display: Related experiments */
   $handler = $view->new_display('block', 'Related experiments', 'block');
-  $handler->display->display_options['display_description'] = 'Experiments that are related to this resource';
-  $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Content: Dataset (field_dataset) - reverse */
-  $handler->display->display_options['relationships']['reverse_field_dataset_node']['id'] = 'reverse_field_dataset_node';
-  $handler->display->display_options['relationships']['reverse_field_dataset_node']['table'] = 'node';
-  $handler->display->display_options['relationships']['reverse_field_dataset_node']['field'] = 'reverse_field_dataset_node';
-  /* Relationship: Content: Software (field_software) - reverse */
-  $handler->display->display_options['relationships']['reverse_field_software_node']['id'] = 'reverse_field_software_node';
-  $handler->display->display_options['relationships']['reverse_field_software_node']['table'] = 'node';
-  $handler->display->display_options['relationships']['reverse_field_software_node']['field'] = 'reverse_field_software_node';
-  /* Relationship: Content: Publication (field_publication) - reverse */
-  $handler->display->display_options['relationships']['reverse_field_publication_node']['id'] = 'reverse_field_publication_node';
-  $handler->display->display_options['relationships']['reverse_field_publication_node']['table'] = 'node';
-  $handler->display->display_options['relationships']['reverse_field_publication_node']['field'] = 'reverse_field_publication_node';
-  $handler->display->display_options['block_description'] = 'Experiments related to resource';
+  $handler->display->display_options['block_description'] = 'experiments related to resource';
   $export['related_experiments'] = $view;
 
   $view = new view();
@@ -171,7 +155,11 @@
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Experiments';
   $handler->display->display_options['use_more_always'] = FALSE;
-  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['access']['type'] = 'role';
+  $handler->display->display_options['access']['role'] = array(
+    1 => '1',
+    2 => '2',
+  );
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['exposed_form']['type'] = 'basic';