Browse Source

fixed materiaux liés display
added test utilisateur role

Bachir Soussi Chiadmi 10 years ago
parent
commit
ce18a79a80

+ 9 - 111
materio_content_types/materio_content_types.features.field_base.inc

@@ -10,41 +10,6 @@
 function materio_content_types_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'body'
-  $field_bases['body'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(
-      0 => 'node',
-    ),
-    'field_name' => 'body',
-    'field_permissions' => array(
-      'type' => 0,
-    ),
-    'foreign keys' => array(
-      'format' => array(
-        'columns' => array(
-          'format' => 'format',
-        ),
-        'table' => 'filter_format',
-      ),
-    ),
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'profile2_private' => FALSE,
-    ),
-    'translatable' => 1,
-    'type' => 'text_with_summary',
-  );
-
   // Exported field_base: 'field_attachments'
   $field_bases['field_attachments'] = array(
     'active' => 1,
@@ -544,39 +509,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'entityreference',
   );
 
-  // Exported field_base: 'field_memo'
-  $field_bases['field_memo'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_memo',
-    'field_permissions' => array(
-      'type' => 2,
-    ),
-    'foreign keys' => array(
-      'format' => array(
-        'columns' => array(
-          'format' => 'format',
-        ),
-        'table' => 'filter_format',
-      ),
-    ),
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'profile2_private' => TRUE,
-    ),
-    'translatable' => 0,
-    'type' => 'text_long',
-  );
-
   // Exported field_base: 'field_nature_titre'
   $field_bases['field_nature_titre'] = array(
     'active' => 1,
@@ -1039,15 +971,15 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         'data_size' => 'normal',
         'data_type' => 'varchar',
       ),
-      'display_format' => '//dsm($entity);
-$workflow = workflow_get_workflow_type_map_by_type($entity->type);
-$states = workflow_get_workflow_states_by_wid($workflow->wid);
-foreach ($states as $state) {
-  if ($state->sid == $entity->workflow) {
-    $display_output = $state->state;
-    dsm($state, \'state\');
-  }
-}
+      'display_format' => '//dsm($entity);
+$workflow = workflow_get_workflow_type_map_by_type($entity->type);
+$states = workflow_get_workflow_states_by_wid($workflow->wid);
+foreach ($states as $state) {
+  if ($state->sid == $entity->workflow) {
+    $display_output = $state->state;
+    dsm($state, \'state\');
+  }
+}
 ',
       'entity_translation_sync' => FALSE,
       'profile2_private' => FALSE,
@@ -1087,40 +1019,6 @@ foreach ($states as $state) {
     'type' => 'text',
   );
 
-  // Exported field_base: 'synonyms_synonym'
-  $field_bases['synonyms_synonym'] = array(
-    'active' => 1,
-    'cardinality' => -1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'synonyms_synonym',
-    'field_permissions' => array(
-      'type' => 0,
-    ),
-    'foreign keys' => array(
-      'format' => array(
-        'columns' => array(
-          'format' => 'format',
-        ),
-        'table' => 'filter_format',
-      ),
-    ),
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'max_length' => 255,
-      'profile2_private' => FALSE,
-    ),
-    'translatable' => 1,
-    'type' => 'text',
-  );
-
   // Exported field_base: 'title_field'
   $field_bases['title_field'] = array(
     'active' => 1,

+ 15 - 9
materio_content_types/materio_content_types.features.field_instance.inc

@@ -2150,7 +2150,7 @@ function materio_content_types_field_default_field_instances() {
         'weight' => 18,
       ),
       'cardbig' => array(
-        'label' => 'hidden',
+        'label' => 'above',
         'module' => 'file',
         'settings' => array(),
         'type' => 'file_default',
@@ -2919,19 +2919,25 @@ function materio_content_types_field_default_field_instances() {
         'weight' => 6,
       ),
       'cardbig' => array(
-        'label' => 'hidden',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 6,
+        'label' => 'above',
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => 1,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 7,
       ),
       'cardfull' => array(
         'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 4,
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => 1,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 20,
       ),
       'cardmedium' => array(
-        'label' => 'hidden',
+        'label' => 'above',
         'module' => 'entityreference',
         'settings' => array(
           'link' => 1,

+ 6 - 0
materio_content_types/materio_content_types.features.user_permission.inc

@@ -498,6 +498,7 @@ function materio_content_types_user_default_permissions() {
       'Student' => 'Student',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
+      'Utilisateur test UC' => 'Utilisateur test UC',
       'administrator' => 'administrator',
       'anonymous user' => 'anonymous user',
       'root' => 'root',
@@ -543,6 +544,7 @@ function materio_content_types_user_default_permissions() {
       'Student' => 'Student',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
+      'Utilisateur test UC' => 'Utilisateur test UC',
       'administrator' => 'administrator',
       'anonymous user' => 'anonymous user',
       'root' => 'root',
@@ -558,6 +560,7 @@ function materio_content_types_user_default_permissions() {
       'Student' => 'Student',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
+      'Utilisateur test UC' => 'Utilisateur test UC',
       'administrator' => 'administrator',
       'anonymous user' => 'anonymous user',
       'root' => 'root',
@@ -575,6 +578,7 @@ function materio_content_types_user_default_permissions() {
       'Student' => 'Student',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
+      'Utilisateur test UC' => 'Utilisateur test UC',
       'administrator' => 'administrator',
       'anonymous user' => 'anonymous user',
       'root' => 'root',
@@ -641,6 +645,7 @@ function materio_content_types_user_default_permissions() {
       'Student' => 'Student',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
+      'Utilisateur test UC' => 'Utilisateur test UC',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -666,6 +671,7 @@ function materio_content_types_user_default_permissions() {
       'Student' => 'Student',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
+      'Utilisateur test UC' => 'Utilisateur test UC',
       'administrator' => 'administrator',
       'anonymous user' => 'anonymous user',
       'root' => 'root',

+ 3 - 1
materio_content_types/materio_content_types.field_group.inc

@@ -1421,6 +1421,7 @@ function materio_content_types_field_group_info() {
     'weight' => '4',
     'children' => array(
       0 => 'field_attachments',
+      1 => 'field_materiau_ref',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -1583,7 +1584,8 @@ function materio_content_types_field_group_info() {
       1 => 'field_description',
       2 => 'field_company_fab',
       3 => 'field_company_distrib',
-      4 => 'group_header',
+      4 => 'field_materiau_ref',
+      5 => 'group_header',
     ),
     'format_type' => 'div',
     'format_settings' => array(

+ 4 - 3
materio_content_types/materio_content_types.info

@@ -19,10 +19,14 @@ dependencies[] = image
 dependencies[] = link
 dependencies[] = list
 dependencies[] = materio_page_title
+dependencies[] = materio_subscriptions
+dependencies[] = materio_user_profiles
+dependencies[] = node
 dependencies[] = options
 dependencies[] = strongarm
 dependencies[] = taxonomy
 dependencies[] = term_reference_tree
+dependencies[] = text
 dependencies[] = title
 dependencies[] = tode
 dependencies[] = video_filter_field
@@ -32,7 +36,6 @@ features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
-features[field_base][] = body
 features[field_base][] = field_attachments
 features[field_base][] = field_authored_on
 features[field_base][] = field_breve_ref
@@ -46,7 +49,6 @@ features[field_base][] = field_infos_from_company
 features[field_base][] = field_localisation
 features[field_base][] = field_materiau_image
 features[field_base][] = field_materiau_ref
-features[field_base][] = field_memo
 features[field_base][] = field_nature_titre
 features[field_base][] = field_note
 features[field_base][] = field_onthologie
@@ -62,7 +64,6 @@ features[field_base][] = field_visuel
 features[field_base][] = field_website
 features[field_base][] = field_workflow_state
 features[field_base][] = name_field
-features[field_base][] = synonyms_synonym
 features[field_base][] = title_field
 features[field_group][] = group_4|node|materiau|cardbig
 features[field_group][] = group_base|node|breve|form

+ 16 - 0
materio_content_types/materio_content_types.strongarm.inc

@@ -240,12 +240,28 @@ function materio_content_types_strongarm() {
             'weight' => '-99',
             'visible' => TRUE,
           ),
+          'cardbig' => array(
+            'weight' => '-99',
+            'visible' => TRUE,
+          ),
+          'cardfull' => array(
+            'weight' => '-99',
+            'visible' => TRUE,
+          ),
         ),
         'workflow' => array(
           'cardmedium' => array(
             'weight' => '99',
             'visible' => TRUE,
           ),
+          'cardbig' => array(
+            'weight' => '99',
+            'visible' => FALSE,
+          ),
+          'cardfull' => array(
+            'weight' => '99',
+            'visible' => FALSE,
+          ),
         ),
       ),
     ),