updated features for precedent commit

2016-12-20 00:18:28 +01:00
parent ddc28956c4
commit 2334eb741b
10 changed files with 140 additions and 52 deletions
--- a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
@@ -237,7 +237,7 @@ function materio_administration_menu_default_menu_links() {
    'customized' => 1,
    'language' => 'und',
    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
+    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/translate',
  );
  // Exported menu link: navigation_customers:admin/store/customers.
  $menu_links['navigation_customers:admin/store/customers'] = array(
@@ -292,7 +292,7 @@ function materio_administration_menu_default_menu_links() {
  $menu_links['navigation_duplicate-mails:admin/users/duplicatemails'] = array(
    'menu_name' => 'navigation',
    'link_path' => 'admin/users/duplicatemails',
-    'router_path' => 'admin/users/duplicatemails',
+    'router_path' => 'admin/users',
    'link_title' => 'Duplicate mails',
    'options' => array(
      'attributes' => array(),
@@ -610,7 +610,7 @@ function materio_administration_menu_default_menu_links() {
    'customized' => 1,
    'language' => 'und',
    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
+    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/translate',
  );
  // Exported menu link: navigation_merge-duplicates:admin/structure/taxonomy/tag_libres/merge/duplicates.
  $menu_links['navigation_merge-duplicates:admin/structure/taxonomy/tag_libres/merge/duplicates'] = array(
@@ -1009,11 +1009,11 @@ function materio_administration_menu_default_menu_links() {
    'external' => 0,
    'has_children' => 0,
    'expanded' => 0,
-    'weight' => -45,
+    'weight' => -50,
    'customized' => 1,
    'language' => 'und',
    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
+    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/translate',
  );
  // Exported menu link: navigation_students:admin/students.
  $menu_links['navigation_students:admin/students'] = array(
@@ -1168,7 +1168,7 @@ function materio_administration_menu_default_menu_links() {
    'customized' => 1,
    'language' => 'und',
    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
+    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/translate',
  );
  // Exported menu link: navigation_taxonomy:admin/structure/taxonomie/admin-taxo.
  $menu_links['navigation_taxonomy:admin/structure/taxonomie/admin-taxo'] = array(
--- a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
@@ -77,39 +77,43 @@ function materio_administration_user_default_permissions() {
  $permissions['access_translation_table_content_type'] = array(
    'name' => 'access_translation_table_content_type',
    'roles' => array(
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'access_translation_table_fields'.
  $permissions['access_translation_table_fields'] = array(
    'name' => 'access_translation_table_fields',
    'roles' => array(
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'access_translation_table_menu'.
  $permissions['access_translation_table_menu'] = array(
    'name' => 'access_translation_table_menu',
    'roles' => array(
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'access_translation_table_taxonomy'.
  $permissions['access_translation_table_taxonomy'] = array(
    'name' => 'access_translation_table_taxonomy',
    'roles' => array(
+      'Translator' => 'Translator',
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'access_translations_overview'.
@@ -118,7 +122,7 @@ function materio_administration_user_default_permissions() {
    'roles' => array(
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'administer content types'.
@@ -409,6 +413,7 @@ function materio_administration_user_default_permissions() {
    'name' => 'edit any materiau content',
    'roles' => array(
      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
@@ -430,7 +435,6 @@ function materio_administration_user_default_permissions() {
    'name' => 'edit node translation shared fields',
    'roles' => array(
      'Admin showroom' => 'Admin showroom',
-      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
@@ -502,7 +506,6 @@ function materio_administration_user_default_permissions() {
    'name' => 'edit translation shared fields',
    'roles' => array(
      'Admin showroom' => 'Admin showroom',
-      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
@@ -515,7 +518,7 @@ function materio_administration_user_default_permissions() {
    'roles' => array(
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'flush caches'.
@@ -533,7 +536,7 @@ function materio_administration_user_default_permissions() {
    'roles' => array(
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'participate in workflow'.
@@ -563,7 +566,7 @@ function materio_administration_user_default_permissions() {
    'roles' => array(
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'revert revisions'.
@@ -652,6 +655,7 @@ function materio_administration_user_default_permissions() {
  $permissions['translate admin strings'] = array(
    'name' => 'translate admin strings',
    'roles' => array(
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
@@ -703,6 +707,7 @@ function materio_administration_user_default_permissions() {
  $permissions['translate user-defined strings'] = array(
    'name' => 'translate user-defined strings',
    'roles' => array(
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
@@ -713,10 +718,11 @@ function materio_administration_user_default_permissions() {
  $permissions['translate_strings'] = array(
    'name' => 'translate_strings',
    'roles' => array(
+      'Translator' => 'Translator',
      'administrator' => 'administrator',
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'update_modules_translations'.
@@ -725,7 +731,7 @@ function materio_administration_user_default_permissions() {
    'roles' => array(
      'root' => 'root',
    ),
-    'module' => 'translate_perms',
+    'module' => 'materio_translator',
  );

  // Exported permission: 'view own unpublished content'.
--- a/sites/all/modules/features/materio_administration/materio_administration.info
+++ b/sites/all/modules/features/materio_administration/materio_administration.info
@@ -13,12 +13,12 @@ dependencies[] = i18n_string
 dependencies[] = login_destination
 dependencies[] = logintoboggan_rules
 dependencies[] = logintoboggan_variable
+dependencies[] = materio_translator
 dependencies[] = materio_user
 dependencies[] = remove_duplicates
 dependencies[] = simplenews
 dependencies[] = taxonomy_csv
 dependencies[] = taxonomy_wrangler
-dependencies[] = translate_perms
 dependencies[] = translation
 dependencies[] = views_data_export
 dependencies[] = workflow
--- a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
@@ -251,6 +251,7 @@ function materio_administration_views_default_views() {
  $handler->display->display_options['access']['role'] = array(
    3 => '3',
    4 => '4',
+    12 => '12',
  );
  $handler->display->display_options['cache']['type'] = 'none';
  $handler->display->display_options['query']['type'] = 'views_query';
@@ -453,6 +454,7 @@ function materio_administration_views_default_views() {
  $handler->display->display_options['fields']['translate_node']['id'] = 'translate_node';
  $handler->display->display_options['fields']['translate_node']['table'] = 'node';
  $handler->display->display_options['fields']['translate_node']['field'] = 'translate_node';
+  $handler->display->display_options['fields']['translate_node']['alter']['alter_text'] = TRUE;
  $handler->display->display_options['fields']['translate_node']['alter']['text'] = '<span class="button">[translate_node]</span>';
  /* Field: Content translation: Translation status */
  $handler->display->display_options['fields']['translate']['id'] = 'translate';
@@ -623,9 +625,10 @@ function materio_administration_views_default_views() {
  $handler->display->display_options['defaults']['access'] = FALSE;
  $handler->display->display_options['access']['type'] = 'role';
  $handler->display->display_options['access']['role'] = array(
+    13 => '13',
    3 => '3',
    4 => '4',
-    13 => '13',
+    12 => '12',
  );
  $handler->display->display_options['defaults']['pager'] = FALSE;
  $handler->display->display_options['pager']['type'] = 'full';
@@ -661,6 +664,7 @@ function materio_administration_views_default_views() {
    'field_memo' => 'field_memo',
    'field_attachments' => 'field_attachments',
    'field_localisation' => 'field_localisation',
+    'field_location' => 'field_location',
    'sid' => 'sid',
    'delete_node' => 'sid',
  );
@@ -716,7 +720,7 @@ function materio_administration_views_default_views() {
    ),
    'nothing' => array(
      'align' => '',
-      'separator' => '<br />',
+      'separator' => '',
      'empty_column' => 0,
    ),
    'field_company_fab' => array(
@@ -762,8 +766,11 @@ function materio_administration_views_default_views() {
      'empty_column' => 0,
    ),
    'field_localisation' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_location' => array(
      'align' => '',
      'separator' => '',
      'empty_column' => 0,
@@ -855,12 +862,14 @@ function materio_administration_views_default_views() {
  $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
  $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
+  $handler->display->display_options['fields']['edit_node']['element_wrapper_type'] = 'span';
+  $handler->display->display_options['fields']['edit_node']['element_wrapper_class'] = 'node-edit';
  /* Field: Global: Custom text */
  $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
  $handler->display->display_options['fields']['nothing']['table'] = 'views';
  $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
-  $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
-  $handler->display->display_options['fields']['nothing']['alter']['text'] = '<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>';
+  $handler->display->display_options['fields']['nothing']['label'] = 'Translate';
+  $handler->display->display_options['fields']['nothing']['alter']['text'] = '<a class="node-edit" href="/node/[nid]/translate">Translate</a>';
  /* Field: Content: Manufacturer */
  $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
  $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
@@ -1167,6 +1176,12 @@ function materio_administration_views_default_views() {
  $handler->display->display_options['title'] = 'Companies';
  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
  $handler->display->display_options['defaults']['group_by'] = FALSE;
+  $handler->display->display_options['defaults']['access'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'role';
+  $handler->display->display_options['access']['role'] = array(
+    3 => '3',
+    4 => '4',
+  );
  $handler->display->display_options['defaults']['pager'] = FALSE;
  $handler->display->display_options['pager']['type'] = 'full';
  $handler->display->display_options['pager']['options']['items_per_page'] = '25';
@@ -1592,6 +1607,12 @@ function materio_administration_views_default_views() {
  $handler->display->display_options['defaults']['title'] = FALSE;
  $handler->display->display_options['title'] = 'Materiaux/brèves';
  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['access'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'role';
+  $handler->display->display_options['access']['role'] = array(
+    3 => '3',
+    4 => '4',
+  );
  $handler->display->display_options['defaults']['pager'] = FALSE;
  $handler->display->display_options['pager']['type'] = 'full';
  $handler->display->display_options['pager']['options']['items_per_page'] = '50';
@@ -1904,8 +1925,8 @@ function materio_administration_views_default_views() {
    t('- Choose an operation -'),
    t('Image'),
    t('Titre'),
-    t('Translation'),
-    t('<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>'),
+    t('Translate'),
+    t('<a class="node-edit" href="/node/[nid]/translate">Translate</a>'),
    t('Fabricants/Distributeurs'),
    t('Fab :<br/>
 [field_company_fab] '),
@@ -1944,6 +1965,8 @@ function materio_administration_views_default_views() {
    t('Title/Name'),
    t('Page : showrooms'),
    t('Showroom'),
+    t('Translation'),
+    t('<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>'),
    t('Phone'),
    t('Corps'),
  );