add description, update routes

GetDKAN · Nov 21, 2020 · b19cfc6 · b19cfc6
1 parent 85602d5
commit b19cfc6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/modules/metastore/modules/metastore_entity/metastore_entity.info.yml b/modules/metastore/modules/metastore_entity/metastore_entity.info.yml
@@ -1,9 +1,9 @@
 name: Metastore Entity
 type: module
-description: .
+description: Entity for storing metadata.
 package: DKAN
 core_version_requirement: ^8 || ^9
 # These modules are required by the tests, must be available at bootstrap time
 dependencies:
-    - options
-
+    - drupal:options
+    - drupal:user
diff --git a/modules/metastore/modules/metastore_entity/metastore_entity.routing.yml b/modules/metastore/modules/metastore_entity/metastore_entity.routing.yml
@@ -13,12 +13,12 @@ entity.metastore_entity_metadata.canonical:
 entity.metastore_entity_metadata.collection:
   path: 'admin/structure/metadata/list'
   defaults:
-  # Calls the list controller, defined in the annotation of the contact entity.
+  # Calls the list controller, defined in the annotation of the metadata entity.
     _entity_list: 'metastore_entity_metadata'
     _title: 'Metadata List'
   requirements:
   # Checks for permission directly.
-    _permission: 'view metadata entity'
+    _permission: 'admininister metadata entity'
 
 metastore_entity.metadata_add:
   path: '/metadata/add'
@@ -36,7 +36,7 @@ entity.metastore_entity_metadata.edit_form:
     _entity_form: metastore_entity_metadata.default
     _title: 'Edit Metadata'
   requirements:
-    _entity_access: 'metastore_entity_metadata.default'
+    _entity_access: 'metastore_entity_metadata.edit'
 
 entity.metastore_entity_metadata.delete_form:
   path: '/metadata/{metastore_entity_metadata}/delete'
@@ -48,7 +48,7 @@ entity.metastore_entity_metadata.delete_form:
     _entity_access: 'metastore_entity_metadata.delete'
 
 metastore_entity.metadata_settings:
-  path: 'admin/structure/metastore_entity_metadata_settings'
+  path: 'admin/structure/metadata/settings'
   defaults:
     _form: '\Drupal\metastore_entity\Form\MetadataSettingsForm'
     _title: 'Metadata Settings'

diff --git a/modules/metastore/modules/metastore_entity/src/Entity/Controller/MetadataListBuilder.php b/modules/metastore/modules/metastore_entity/src/Entity/Controller/MetadataListBuilder.php
@@ -85,7 +85,7 @@ public function buildHeader() {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\metastore_entity\Entity\Contact */
+    /* @var $entity \Drupal\metastore_entity\Entity\Metadata */
     $row['id'] = $entity->id();
     $row['title'] = $entity->toLink()->toString();
     $row['data'] = $entity->data->value;

diff --git a/modules/metastore/modules/metastore_entity/src/Entity/Metadata.php b/modules/metastore/modules/metastore_entity/src/Entity/Metadata.php
@@ -43,10 +43,10 @@
  *     "data" = "data"
  *   },
  *   links = {
- *     "canonical" = "/metastore_entity_metadata/{metastore_entity_metadata}",
- *     "edit-form" = "/metastore_entity_metadata/{metastore_entity_metadata}/edit",
+ *     "canonical" = "/metadata/{metastore_entity_metadata}",
+ *     "edit-form" = "/metadata/{metastore_entity_metadata}/edit",
  *     "delete-form" = "/metadata/{metastore_entity_metadata}/delete",
- *     "collection" = "/metastore_entity_metadata/list"
+ *     "collection" = "/admin/structure/metadata/list"
  *   },
  *   field_ui_base_route = "metastore_entity.metadata_settings",
  * )
@@ -193,7 +193,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
 
     $fields['langcode'] = BaseFieldDefinition::create('language')
       ->setLabel(t('Language code'))
-      ->setDescription(t('The language code of ContentEntityExample entity.'));
+      ->setDescription(t('The language code of the Metadata entity.'));
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Created'))
       ->setDescription(t('The time that the entity was created.'));

diff --git a/modules/metastore/modules/metastore_entity/src/MetadataAccessControlHandler.php b/modules/metastore/modules/metastore_entity/src/MetadataAccessControlHandler.php
@@ -51,7 +51,7 @@ protected function checkCreateAccess(AccountInterface $account, array $context,
     if ($account->hasPermission($admin_permission)) {
       return AccessResult::allowed();
     }
-    return AccessResult::allowedIfHasPermission($account, 'add contact entity');
+    return AccessResult::allowedIfHasPermission($account, 'add metadata entity');
   }
 
 }