Bachir Soussi Chiadmi 5 роки тому
батько
коміт
9ec15cb1d8

+ 1 - 1
config/sync/user.role.admin.yml

@@ -143,8 +143,8 @@ permissions:
   - 'view materiau revisions'
   - 'view materio_order_type commerce_order'
   - 'view member profile'
+  - 'view own profile'
   - 'view page revisions'
-  - 'view profile'
   - 'view simplenews_issue revisions'
   - 'view static revisions'
   - 'view the administration theme'

+ 1 - 1
config/sync/user.role.authenticated.yml

@@ -32,10 +32,10 @@ permissions:
   - 'use text format wysiwyg'
   - 'view commerce_product'
   - 'view own commerce_order'
+  - 'view own profile'
   - 'view own unpublished chutier entities'
   - 'view own unpublished composition entities'
   - 'view own unpublished fil entities'
-  - 'view profile'
   - 'view published composition entities'
   - 'view published fil entities'
   - 'view search api pages'

+ 320 - 59
config/sync/views.view.admin_nodes.yml

@@ -20,6 +20,8 @@ dependencies:
     - node.type.article
     - node.type.materiau
     - taxonomy.vocabulary.company
+    - taxonomy.vocabulary.tags
+    - taxonomy.vocabulary.thesaurus
     - user.role.admin
     - user.role.root
   module:
@@ -2063,76 +2065,94 @@ display:
                   title: ''
                   description: ''
                   open: '1'
-                  weight: '-17'
+                  weight: '-25'
                   id: container-0
                   pid: root
                   depth: '1'
                   type: container
+                field_migration_value:
+                  weight: '-23'
+                  id: field_migration_value
+                  pid: container-0
+                  depth: '2'
+                  type: filter
                 field_workflow_value:
-                  weight: '-17'
+                  weight: '-22'
                   id: field_workflow_value
                   pid: container-0
                   depth: '2'
                   type: filter
-                field_migration_value:
-                  weight: '-16'
-                  id: field_migration_value
+                field_famille_value:
+                  weight: '-21'
+                  id: field_famille_value
                   pid: container-0
                   depth: '2'
                   type: filter
                 title:
-                  weight: '-15'
+                  weight: '-20'
                   id: title
                   pid: container-0
                   depth: '2'
                   type: filter
-                field_memo_value:
-                  weight: '-14'
-                  id: field_memo_value
+                field_reference_value:
+                  weight: '-19'
+                  id: field_reference_value
+                  pid: container-0
+                  depth: '2'
+                  type: filter
+                field_thesaurus_target_id:
+                  weight: '-18'
+                  id: field_thesaurus_target_id
+                  pid: container-0
+                  depth: '2'
+                  type: filter
+                field_tags_target_id:
+                  weight: '-17'
+                  id: field_tags_target_id
                   pid: container-0
                   depth: '2'
                   type: filter
                 tid:
-                  weight: '-13'
+                  weight: '-16'
                   id: tid
                   pid: container-0
                   depth: '2'
                   type: filter
-                container-2:
+                field_samples_location:
+                  weight: '-15'
+                  id: field_samples_location
+                  pid: container-0
+                  depth: '2'
+                  type: filter
+                field_memo_value:
+                  weight: '-14'
+                  id: field_memo_value
+                  pid: container-0
+                  depth: '2'
+                  type: filter
+                container-3:
                   container_type: container
                   title: ''
                   description: ''
                   open: '1'
-                  weight: '-16'
-                  id: container-2
+                  weight: '-23'
+                  id: container-3
                   pid: root
                   depth: '1'
                   type: container
-                field_samples_location:
-                  weight: '-17'
-                  id: field_samples_location
-                  pid: container-2
-                  depth: '2'
-                  type: filter
                 submit:
-                  weight: '-16'
+                  weight: '-23'
                   id: submit
-                  pid: container-2
-                  depth: '2'
-                  type: buttons
-                reset:
-                  weight: '-15'
-                  id: reset
-                  pid: container-2
+                  pid: container-3
                   depth: '2'
                   type: buttons
-                container-3:
+                container-2:
                   container_type: container
                   title: ''
                   description: ''
-                  weight: '-14'
-                  open: 0
-                  id: container-3
+                  open: '1'
+                  weight: '-22'
+                  id: container-2
                   pid: root
                   depth: '1'
                   type: container
@@ -2140,8 +2160,8 @@ display:
                   container_type: container
                   title: ''
                   description: ''
-                  open: '1'
-                  weight: '-13'
+                  weight: '-21'
+                  open: 0
                   id: container-1
                   pid: root
                   depth: '1'
@@ -2150,7 +2170,7 @@ display:
                   container_type: details
                   title: 'Container 4'
                   description: ''
-                  weight: '-12'
+                  weight: '-19'
                   open: 0
                   id: container-4
                   pid: root
@@ -2160,7 +2180,7 @@ display:
                   container_type: details
                   title: 'Container 5'
                   description: ''
-                  weight: '-11'
+                  weight: '-18'
                   open: 0
                   id: container-5
                   pid: root
@@ -2170,22 +2190,52 @@ display:
                   container_type: details
                   title: 'Container 6'
                   description: ''
-                  weight: '-10'
+                  weight: '-17'
                   open: 0
                   id: container-6
                   pid: root
                   depth: '1'
                   type: container
+                container-8:
+                  container_type: details
+                  title: 'Container 8'
+                  description: ''
+                  weight: '-16'
+                  open: 0
+                  id: container-8
+                  pid: root
+                  depth: '1'
+                  type: container
                 container-7:
                   container_type: details
                   title: 'Container 7'
                   description: ''
-                  weight: '-9'
+                  weight: '-15'
                   open: 0
                   id: container-7
                   pid: root
                   depth: '1'
                   type: container
+                container-10:
+                  container_type: details
+                  title: 'Container 10'
+                  description: ''
+                  weight: '-14'
+                  open: 0
+                  id: container-10
+                  pid: root
+                  depth: '1'
+                  type: container
+                container-9:
+                  container_type: details
+                  title: 'Container 9'
+                  description: ''
+                  weight: '-13'
+                  open: 0
+                  id: container-9
+                  pid: root
+                  depth: '1'
+                  type: container
       path: admin/content/materials
       menu:
         type: tab
@@ -3580,10 +3630,10 @@ display:
           entity_type: node
           entity_field: title
           plugin_id: string
-        tid:
-          id: tid
-          table: taxonomy_index
-          field: tid
+        field_tags_target_id:
+          id: field_tags_target_id
+          table: node__field_tags
+          field: field_tags_target_id
           relationship: none
           group_type: group
           admin_label: ''
@@ -3592,12 +3642,12 @@ display:
           group: 1
           exposed: true
           expose:
-            operator_id: tid_op
-            label: Company
+            operator_id: field_tags_target_id_op
+            label: Tags
             description: ''
             use_operator: false
-            operator: tid_op
-            identifier: tid
+            operator: field_tags_target_id_op
+            identifier: field_tags_target_id
             required: false
             remember: false
             multiple: false
@@ -3630,41 +3680,48 @@ display:
           reduce_duplicates: false
           type: textfield
           limit: true
-          vid: company
+          vid: tags
           hierarchy: false
           error_message: true
           parent: 0
           level_labels: ''
           force_deepest: false
           plugin_id: taxonomy_index_tid
-        field_memo_value:
-          id: field_memo_value
-          table: node__field_memo
-          field: field_memo_value
+        field_thesaurus_target_id:
+          id: field_thesaurus_target_id
+          table: node__field_thesaurus
+          field: field_thesaurus_target_id
           relationship: none
           group_type: group
           admin_label: ''
-          operator: contains
-          value: ''
+          operator: or
+          value: {  }
           group: 1
           exposed: true
           expose:
-            operator_id: field_memo_value_op
-            label: Memo
+            operator_id: field_thesaurus_target_id_op
+            label: Thesaurus
             description: ''
             use_operator: false
-            operator: field_memo_value_op
-            identifier: field_memo_value
+            operator: field_thesaurus_target_id_op
+            identifier: field_thesaurus_target_id
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
+              unverified: '0'
               anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
               admin: '0'
               root: '0'
-              user: '0'
-            placeholder: ''
+            reduce: false
           is_grouped: false
           group_info:
             label: ''
@@ -3677,7 +3734,73 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: string
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: thesaurus
+          hierarchy: false
+          error_message: true
+          parent: 0
+          level_labels: ''
+          force_deepest: false
+          plugin_id: taxonomy_index_tid
+        tid:
+          id: tid
+          table: taxonomy_index
+          field: tid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: tid_op
+            label: Company
+            description: ''
+            use_operator: false
+            operator: tid_op
+            identifier: tid
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: company
+          hierarchy: false
+          error_message: true
+          parent: 0
+          level_labels: ''
+          force_deepest: false
+          plugin_id: taxonomy_index_tid
         field_migration_value:
           id: field_migration_value
           table: node__field_migration
@@ -3850,6 +3973,144 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+        field_memo_value:
+          id: field_memo_value
+          table: node__field_memo
+          field: field_memo_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_memo_value_op
+            label: Memo
+            description: ''
+            use_operator: false
+            operator: field_memo_value_op
+            identifier: field_memo_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              user: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+        field_reference_value:
+          id: field_reference_value
+          table: node__field_reference
+          field: field_reference_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_reference_value_op
+            label: Reference
+            description: ''
+            use_operator: false
+            operator: field_reference_value_op
+            identifier: field_reference_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+        field_famille_value:
+          id: field_famille_value
+          table: node__field_famille
+          field: field_famille_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_famille_value_op
+            label: Famille
+            description: ''
+            use_operator: false
+            operator: field_famille_value_op
+            identifier: field_famille_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          plugin_id: list_field
       filter_groups:
         operator: AND
         groups:

Різницю між файлами не показано, бо вона завелика
+ 1849 - 314
config/sync/views.view.admin_taxo.yml


+ 82 - 70
config/sync/views.view.admin_users.yml

@@ -241,7 +241,7 @@ display:
           batch_size: 10
           form_step: true
           buttons: false
-          clear_on_exposed: 0
+          clear_on_exposed: false
           action_title: Action
           selected_actions:
             'entity:break_lock:user': 'entity:break_lock:user'
@@ -990,7 +990,7 @@ display:
           exposed: true
           expose:
             operator_id: uid_op
-            label: 'Name (autocomplete)'
+            label: Name
             description: ''
             use_operator: false
             operator: uid_op
@@ -1000,18 +1000,17 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
+              unverified: '0'
               anonymous: '0'
-              admin: '0'
-              root: '0'
-              contact_company: '0'
-              adherent: '0'
               free_user: '0'
-              premium: '0'
-              unverified: '0'
-              student: '0'
+              contact_company: '0'
               alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
               translator: '0'
               admin_showroom: '0'
+              admin: '0'
+              root: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -1041,7 +1040,7 @@ display:
           exposed: true
           expose:
             operator_id: field_company_target_id_op
-            label: 'Company (field_company)'
+            label: Company
             description: ''
             use_operator: false
             operator: field_company_target_id_op
@@ -1051,18 +1050,17 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
+              unverified: '0'
               anonymous: '0'
-              admin: '0'
-              root: '0'
-              contact_company: '0'
-              adherent: '0'
               free_user: '0'
-              premium: '0'
-              unverified: '0'
-              student: '0'
+              contact_company: '0'
               alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
               translator: '0'
               admin_showroom: '0'
+              admin: '0'
+              root: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -1099,7 +1097,7 @@ display:
           exposed: true
           expose:
             operator_id: field_showroom_target_id_op
-            label: 'Showroom (field_showroom)'
+            label: Showroom
             description: ''
             use_operator: false
             operator: field_showroom_target_id_op
@@ -1109,18 +1107,17 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
+              unverified: '0'
               anonymous: '0'
-              admin: '0'
-              root: '0'
-              contact_company: '0'
-              adherent: '0'
               free_user: '0'
-              premium: '0'
-              unverified: '0'
-              student: '0'
+              contact_company: '0'
               alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
               translator: '0'
               admin_showroom: '0'
+              admin: '0'
+              root: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -1157,7 +1154,7 @@ display:
           exposed: true
           expose:
             operator_id: field_memo_value_op
-            label: 'Memo (field_memo)'
+            label: Memo
             description: ''
             use_operator: false
             operator: field_memo_value_op
@@ -1167,18 +1164,17 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
+              unverified: '0'
               anonymous: '0'
-              admin: '0'
-              root: '0'
-              contact_company: '0'
-              adherent: '0'
               free_user: '0'
-              premium: '0'
-              unverified: '0'
-              student: '0'
+              contact_company: '0'
               alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
               translator: '0'
               admin_showroom: '0'
+              admin: '0'
+              root: '0'
             placeholder: ''
           is_grouped: false
           group_info:
@@ -1413,45 +1409,75 @@ display:
                   title: ''
                   description: ''
                   open: '1'
-                  weight: '-17'
+                  weight: '-19'
                   id: container-0
                   pid: root
                   depth: '1'
                   type: container
                 status:
-                  weight: '-19'
+                  weight: '-17'
                   id: status
                   pid: container-0
                   depth: '2'
                   type: filter
                 roles_target_id:
-                  weight: '-18'
+                  weight: '-16'
                   id: roles_target_id
                   pid: container-0
                   depth: '2'
                   type: filter
+                uid:
+                  weight: '-15'
+                  id: uid
+                  pid: container-0
+                  depth: '2'
+                  type: filter
                 mail:
-                  weight: '-17'
+                  weight: '-14'
                   id: mail
                   pid: container-0
                   depth: '2'
                   type: filter
+                field_showroom_target_id:
+                  weight: '-13'
+                  id: field_showroom_target_id
+                  pid: container-0
+                  depth: '2'
+                  type: filter
+                field_company_target_id:
+                  weight: '-12'
+                  id: field_company_target_id
+                  pid: container-0
+                  depth: '2'
+                  type: filter
+                field_memo_value:
+                  weight: '-11'
+                  id: field_memo_value
+                  pid: container-0
+                  depth: '2'
+                  type: filter
                 container-4:
                   container_type: container
                   title: ''
                   description: ''
-                  weight: '-16'
+                  weight: '-17'
                   open: 0
                   id: container-4
                   pid: root
                   depth: '1'
                   type: container
-                uid:
-                  weight: '-17'
-                  id: uid
+                submit:
+                  weight: '-19'
+                  id: submit
                   pid: container-4
                   depth: '2'
-                  type: filter
+                  type: buttons
+                reset:
+                  weight: '-18'
+                  id: reset
+                  pid: container-4
+                  depth: '2'
+                  type: buttons
                 container-1:
                   container_type: container
                   title: ''
@@ -1462,18 +1488,6 @@ display:
                   pid: root
                   depth: '1'
                   type: container
-                field_showroom_target_id:
-                  weight: '-19'
-                  id: field_showroom_target_id
-                  pid: container-1
-                  depth: '2'
-                  type: filter
-                field_company_target_id:
-                  weight: '-18'
-                  id: field_company_target_id
-                  pid: container-1
-                  depth: '2'
-                  type: filter
                 container-2:
                   container_type: container
                   title: ''
@@ -1484,24 +1498,12 @@ display:
                   pid: root
                   depth: '1'
                   type: container
-                field_memo_value:
-                  weight: '-17'
-                  id: field_memo_value
-                  pid: container-2
-                  depth: '2'
-                  type: filter
-                submit:
-                  weight: '-13'
-                  id: submit
-                  pid: root
-                  depth: '1'
-                  type: buttons
                 container-3:
                   container_type: container
                   title: ''
                   description: ''
                   open: '1'
-                  weight: '-12'
+                  weight: '-13'
                   id: container-3
                   pid: root
                   depth: '1'
@@ -1510,7 +1512,7 @@ display:
                   container_type: details
                   title: 'Container 5'
                   description: ''
-                  weight: '-11'
+                  weight: '-12'
                   open: 0
                   id: container-5
                   pid: root
@@ -1520,7 +1522,7 @@ display:
                   container_type: details
                   title: 'Container 6'
                   description: ''
-                  weight: '-10'
+                  weight: '-11'
                   open: 0
                   id: container-6
                   pid: root
@@ -1530,12 +1532,22 @@ display:
                   container_type: details
                   title: 'Container 7'
                   description: ''
-                  weight: '-9'
+                  weight: '-10'
                   open: 0
                   id: container-7
                   pid: root
                   depth: '1'
                   type: container
+                container-8:
+                  container_type: details
+                  title: 'Container 8'
+                  description: ''
+                  weight: '-9'
+                  open: 0
+                  id: container-8
+                  pid: root
+                  depth: '1'
+                  type: container
       path: admin/people/users
       menu:
         type: tab

+ 13 - 0
web/themes/custom/matminimal/css/matminimal.css

@@ -29,3 +29,16 @@
 .js td .dropbutton-multiple{
   border-radius: 3px;
 }
+.views-exposed-form{
+  font-size: 0.9em;
+}
+.views-exposed-form input[type="text"]{
+  max-width:10em;
+}
+.views-exposed-form input[type="text"].form-autocomplete{
+  max-width:14em;
+}
+.views-exposed-form select.form-select{
+  min-height: 0;
+  padding: 0.2em 0.4em 0.2em 0.5em;
+}

Деякі файли не було показано, через те що забагато файлів було змінено