Browse Source

Removing dependency loop in view

pull/744/head
dannylamb 5 years ago
parent
commit
21b916b427
  1. 21
      config/schema/islandora.schema.yml
  2. 18
      islandora.links.action.yml
  3. 22
      islandora.routing.yml
  4. 31
      modules/islandora_core_feature/config/install/views.view.collections.yml

21
config/schema/islandora.schema.yml

@ -14,18 +14,6 @@ islandora.settings:
jwt_expiry: jwt_expiry:
type: string type: string
label: 'How long JWTs should last before expiring.' label: 'How long JWTs should last before expiring.'
upload_form_bundle:
type: string
label: 'Upload Form Content Type'
upload_form_location:
type: string
label: 'Upload Form Location'
upload_form_term:
type: string
label: 'Upload Form Media Use Term'
upload_form_allowed_extensions:
type: string
label: 'Upload Form Allowed Extensions'
gemini_url: gemini_url:
type: uri type: uri
label: 'Url to Gemini microservice' label: 'Url to Gemini microservice'
@ -90,9 +78,6 @@ condition.plugin.node_has_term:
uri: uri:
type: text type: text
label: 'Taxonomy Term URI' label: 'Taxonomy Term URI'
logic:
type: string
label: 'Logic (AND or OR)'
condition.plugin.node_has_parent: condition.plugin.node_has_parent:
type: condition.plugin type: condition.plugin
@ -110,9 +95,6 @@ condition.plugin.media_has_term:
uri: uri:
type: text type: text
label: 'Taxonomy Term URI' label: 'Taxonomy Term URI'
logic:
type: string
label: 'Logic (AND or OR)'
condition.plugin.parent_node_has_term: condition.plugin.parent_node_has_term:
type: condition.plugin type: condition.plugin
@ -120,9 +102,6 @@ condition.plugin.parent_node_has_term:
uri: uri:
type: text type: text
label: 'Taxonomy Term URI' label: 'Taxonomy Term URI'
logic:
type: text
label: 'Logic (AND or OR)'
condition.plugin.file_uses_filesystem: condition.plugin.file_uses_filesystem:
type: condition.plugin type: condition.plugin

18
islandora.links.action.yml

@ -1,24 +1,12 @@
islandora.upload_media:
route_name: islandora.upload_media
title: Upload Media
appears_on:
- view.media_of.page_1
islandora.add_media_to_node: islandora.add_media_to_node:
route_name: islandora.add_media_to_node_page route_name: islandora.add_media_to_node_page
title: Add Media title: Add media
appears_on: appears_on:
- view.media_of.page_1 - view.media_of.page_1
islandora.upload_children:
route_name: islandora.upload_children
title: Upload Children
appears_on:
- view.manage_members.page_1
islandora.add_member_to_node: islandora.add_member_to_node:
route_name: islandora.add_member_to_node_page route_name: islandora.add_member_to_node_page
title: Add Child title: Add child
appears_on: appears_on:
- view.manage_members.page_1 - view.manage_members.page_1
@ -30,6 +18,6 @@ islandora.reorder_children:
islandora.add_collection: islandora.add_collection:
route_name: islandora.add_collection route_name: islandora.add_collection
title: Add Collection title: Add collection
appears_on: appears_on:
- view.collections.page_1 - view.collections.page_1

22
islandora.routing.yml

@ -27,17 +27,6 @@ islandora.add_member_to_node_page:
requirements: requirements:
_entity_create_any_access: 'node' _entity_create_any_access: 'node'
islandora.upload_children:
path: '/node/{node}/members/upload'
defaults:
_form: '\Drupal\islandora\Form\AddChildrenForm'
_title: 'Upload Children'
options:
_admin_route: 'TRUE'
requirements:
_access: 'TRUE'
#_permssion: 'create node,create media'
islandora.add_media_to_node_page: islandora.add_media_to_node_page:
path: '/node/{node}/media/add' path: '/node/{node}/media/add'
defaults: defaults:
@ -49,16 +38,6 @@ islandora.add_media_to_node_page:
requirements: requirements:
_entity_create_any_access: 'media' _entity_create_any_access: 'media'
islandora.upload_media:
path: '/node/{node}/media/upload'
defaults:
_form: '\Drupal\islandora\Form\AddMediaForm'
_title: 'Add media'
options:
_admin_route: 'TRUE'
requirements:
_custom_access: '\Drupal\islandora\Form\AddMediaForm::access'
islandora.add_collection: islandora.add_collection:
path: '/collection/add' path: '/collection/add'
defaults: defaults:
@ -83,7 +62,6 @@ islandora.media_source_put_to_node:
path: '/node/{node}/media/{media_type}/{taxonomy_term}' path: '/node/{node}/media/{media_type}/{taxonomy_term}'
defaults: defaults:
_controller: '\Drupal\islandora\Controller\MediaSourceController::putToNode' _controller: '\Drupal\islandora\Controller\MediaSourceController::putToNode'
methods: [PUT] methods: [PUT]
requirements: requirements:
_custom_access: '\Drupal\islandora\Controller\MediaSourceController::putToNodeAccess' _custom_access: '\Drupal\islandora\Controller\MediaSourceController::putToNodeAccess'

31
modules/islandora_core_feature/config/install/views.view.collections.yml

@ -1,8 +1,6 @@
langcode: en langcode: en
status: true status: true
dependencies: dependencies:
config:
- core.entity_view_mode.node.teaser
module: module:
- media - media
- node - node
@ -79,6 +77,9 @@ display:
description: '' description: ''
columns: columns:
title: title title: title
field_member_of: field_member_of
field_file_size: field_file_size
operations: operations
info: info:
title: title:
sortable: false sortable: false
@ -87,12 +88,34 @@ display:
separator: '' separator: ''
empty_column: false empty_column: false
responsive: '' responsive: ''
field_member_of:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
field_file_size:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
operations:
align: ''
separator: ''
empty_column: false
responsive: ''
default: '-1' default: '-1'
empty_table: false empty_table: false
row: row:
type: 'entity:node' type: fields
options: options:
view_mode: teaser default_field_elements: true
inline: { }
separator: ''
hide_empty: false
fields: fields:
title: title:
id: title id: title

Loading…
Cancel
Save