4 Commits 93900611bc ... 0f341f6aca

Author SHA1 Message Date
  Bachir Soussi Chiadmi 0f341f6aca fixe search by genre #425 5 years ago
  Bachir Soussi Chiadmi 2c8138fade fixe recently uploaded block #427 #428 5 years ago
  Bachir Soussi Chiadmi 6a44d5b5ee changed index,notice,articles,article width #430 5 years ago
  Bachir Soussi Chiadmi 8722244dfd added field view_mode to static pages 5 years ago

+ 22 - 6
sites/all/modules/figli/edlp_corpus/src/Controller/CorpusController.php

@@ -163,14 +163,27 @@ class CorpusController extends ControllerBase {
     ->range(0,20);
 
    $nids = $query->execute();
+   $nodes = entity_load_multiple('node', $nids);
 
-   $this->lastdocs_nodes = entity_load_multiple('node', $nids);
+   // $current_langcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
 
-   // record an array of nids for corpus map filtering
+   $this->lastdocs_nodes = [];
    $this->lastdocs_nids = [];
-   foreach($nids as $key => $nid){
-     $this->lastdocs_nids[] = $nid;
+   foreach ($nodes as $node) {
+     // remove masqué
+     $sid = WorkflowManager::getCurrentStateId($node, 'field_workflow');
+     if($sid != 'corpus_documents_publie') continue;
+
+     $this->lastdocs_nodes[] = $node;
+     // record an array of nids for corpus map filtering
+     $this->lastdocs_nids[] = $node->get('nid')->getString();
    }
+
+   // // record an array of nids for corpus map filtering
+   // $this->lastdocs_nids = [];
+   // foreach($nids as $key => $nid){
+   //   $this->lastdocs_nids[] = $nid;
+   // }
   }
 
   private function toRenderable(){
@@ -209,7 +222,7 @@ class CorpusController extends ControllerBase {
 
     $data = [
       'rendered'=> $rendered,
-      'title'=>'Last Documents',
+      'title'=>t('Recently uploaded'),
       'documents_lies' => $this->lastdocs_nids,
     ];
 
@@ -232,7 +245,10 @@ class CorpusController extends ControllerBase {
 
     $data['#cache'] = [
       'max-age' => \Drupal\Core\Cache\Cache::PERMANENT,
-      'tags' => ['edlp-lastdocs-cache']
+      'tags' => ['edlp-lastdocs-cache'],
+      'contexts' => [
+        'languages:language_content'
+      ]
     ];
 
     // $response = new JsonResponse();

+ 1 - 1
sites/all/modules/figli/edlp_search/assets/scripts/edlp_search.js

@@ -56,7 +56,7 @@
     if(args.keys.length > 2
       || args.entries.length > 0
       || args.langues.length > 2
-      || args.genres > 2){
+      || args.genres.length > 2){
         loadResults(args);
     }
 

+ 1 - 1
sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--node--article.html.twig

@@ -1,4 +1,4 @@
-<div class="col small-col-12 med-col-6 large-col-6">
+<div class="col small-col-12 med-col-5 large-col-5">
   <div class="wrapper">
     {{ content }}
   </div>

+ 1 - 1
sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--taxonomy-term--index.html.twig

@@ -1,4 +1,4 @@
-<div class="col small-col-12 med-col-4 large-col-4">
+<div class="col small-col-12 med-col-5 large-col-5">
   <div class="wrapper">
     {{ content }}
   </div>

+ 1 - 1
sites/all/themes/custom/edlptheme/templates/content/edlp-ajax--taxonomy-term--notice.html.twig

@@ -1,4 +1,4 @@
-<div class="col small-col-12 med-col-4 large-col-4">
+<div class="col small-col-12 med-col-5 large-col-5">
   <div class="wrapper">
     {{ content }}
   </div>

+ 1 - 1
sites/all/themes/custom/edlptheme/templates/content/edlp-corpus-articlesindex.html.twig

@@ -1,4 +1,4 @@
-<div class="col small-col-12 med-col-6 large-col-6">
+<div class="col small-col-12 med-col-5 large-col-5">
   <div class="wrapper">
       {{ articles }}
   </div>

+ 10 - 2
sites/default/config/sync/core.entity_form_display.node.static.default.yml

@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.static.field_afficher_en_page_d_acceuil
     - field.field.node.static.field_domain_access
     - field.field.node.static.field_domain_all_affiliates
+    - field.field.node.static.field_view_mode
     - field.field.node.static.field_visuel
     - field.field.node.static.field_workflow_generic
     - image.style.thumbnail
@@ -51,6 +52,7 @@ third_party_settings:
       children:
         - langcode
         - field_afficher_en_page_d_acceuil
+        - field_view_mode
         - field_workflow_generic
       parent_name: group_tabs
       weight: 14
@@ -97,6 +99,12 @@ content:
     weight: 41
     third_party_settings: {  }
     region: content
+  field_view_mode:
+    weight: 3
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   field_visuel:
     weight: 3
     settings:
@@ -106,7 +114,7 @@ content:
     type: image_image
     region: content
   field_workflow_generic:
-    weight: 3
+    weight: 4
     settings: {  }
     third_party_settings: {  }
     type: workflow_default
@@ -128,9 +136,9 @@ content:
     third_party_settings: {  }
   url_redirects:
     weight: 50
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   path: true

+ 6 - 0
sites/default/config/sync/core.entity_view_display.node.static.default.yml

@@ -5,6 +5,9 @@ dependencies:
   config:
     - field.field.node.static.body
     - field.field.node.static.field_afficher_en_page_d_acceuil
+    - field.field.node.static.field_domain_access
+    - field.field.node.static.field_domain_all_affiliates
+    - field.field.node.static.field_view_mode
     - field.field.node.static.field_visuel
     - field.field.node.static.field_workflow_generic
     - image.style.large
@@ -42,5 +45,8 @@ content:
 hidden:
   addtoany: true
   field_afficher_en_page_d_acceuil: true
+  field_domain_access: true
+  field_domain_all_affiliates: true
+  field_view_mode: true
   field_workflow_generic: true
   langcode: true

+ 21 - 0
sites/default/config/sync/field.field.node.static.field_view_mode.yml

@@ -0,0 +1,21 @@
+uuid: 53e6dde4-fcad-4bcb-8a08-272b6e1d299a
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_view_mode
+    - node.type.static
+  module:
+    - options
+id: node.static.field_view_mode
+field_name: field_view_mode
+entity_type: node
+bundle: static
+label: 'Mode d''affichage'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_integer