' . t('Edlp module that handle chutier and fils entities') . '
'; + $output .= '' . t('Edlp module that handle chutier and compositions entities') . '
'; return $output; default: } } + +/** +* hook_entity_extra_field_info() +* +*/ +function edlp_studio_entity_extra_field_info(){ + $extra = []; + // TODO: get node content type by settings @see readme + $extra['node']['enregistrement']['display']['add_to_chutier'] = [ + 'label' => t('Add to chutier link'), + 'description' => 'Display a link to add the content to chutier', + 'weight' => 99, + 'visible' => FALSE, + ]; + return $extra; +} + + +/** + * Implements hook_ENTITY_TYPE_view(). + * @see https://www.amazeelabs.com/en/render-menu-tree-custom-code-drupal-8 + */ +function edlp_studio_node_view(array &$build, \Drupal\Core\Entity\EntityInterface $entity, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode) { + $display_settings = $display->getComponent('add_to_chutier'); + if (!empty($display_settings)) { + // dpm($entity); + // dpm($entity->id()); + $url = Url::fromRoute('edlp_studio.chutier_controller_add_content', ['id'=>$entity->id()], array( + 'attributes' => array( + 'class' => ['add-to-chutier-link', 'ajax-link'], + 'target_id' => $entity->id(), + ) + )); + $build['add_to_chutier'] = array( + '#title' => t("Add this content to chutier."), + '#type' => 'link', + '#url' => $url, + '#options'=>array( + 'attributes' => array( + 'data-drupal-link-system-path' => $url->getInternalPath() + ) + ) + ); + } +} diff --git a/sites/all/modules/figli/edlp_studio/edlp_studio.permissions.yml b/sites/all/modules/figli/edlp_studio/edlp_studio.permissions.yml index 93dbdf377..a901710ce 100644 --- a/sites/all/modules/figli/edlp_studio/edlp_studio.permissions.yml +++ b/sites/all/modules/figli/edlp_studio/edlp_studio.permissions.yml @@ -31,32 +31,35 @@ view any unpublished chutier entities: view own unpublished chutier entities: title: 'View own unpublished Chutier entities' -# Fils -add fil entities: - title: 'Create new Fil entities' +use chutier: + title: 'use chutier' -administer fil entities: - title: 'Administer Fil entities' - description: 'Allow to access the administration form to configure Fil entities.' +# Compositions +add composition entities: + title: 'Create new Composition entities' + +administer composition entities: + title: 'Administer Composition entities' + description: 'Allow to access the administration form to configure Composition entities.' restrict access: true -delete any fil entities: - title: 'Delete any Fil entities' +delete any composition entities: + title: 'Delete any Composition entities' -edit any fil entities: - title: 'Edit any Fil entities' +edit any composition entities: + title: 'Edit any Composition entities' -delete own fil entities: - title: 'Delete own Fil entities' +delete own composition entities: + title: 'Delete own Composition entities' -edit own fil entities: - title: 'Edit own Fil entities' +edit own composition entities: + title: 'Edit own Composition entities' -view published fil entities: - title: 'View published Fil entities' +view published composition entities: + title: 'View published Composition entities' -view any unpublished fil entities: - title: 'View any unpublished Fil entities' +view any unpublished composition entities: + title: 'View any unpublished Composition entities' -view own unpublished fil entities: - title: 'View own unpublished Fil entities' +view own unpublished composition entities: + title: 'View own unpublished Composition entities' diff --git a/sites/all/modules/figli/edlp_studio/edlp_studio.routing.yml b/sites/all/modules/figli/edlp_studio/edlp_studio.routing.yml index 5ec1eae7c..18b6167f5 100644 --- a/sites/all/modules/figli/edlp_studio/edlp_studio.routing.yml +++ b/sites/all/modules/figli/edlp_studio/edlp_studio.routing.yml @@ -5,3 +5,11 @@ edlp_studio.studio: _title: 'Studio' requirements: _permission: 'administer studio' + +edlp_studio.chutier_controller_add_content: + path: '/studio/chutier/add/{id}' + defaults: + _controller: '\Drupal\edlp_studio\Controller\ChutierController::addContent' + _title: 'Add content to chutier' + requirements: + _permission: 'use chutier' diff --git a/sites/all/modules/figli/edlp_studio/readme.md b/sites/all/modules/figli/edlp_studio/readme.md new file mode 100644 index 000000000..52507a671 --- /dev/null +++ b/sites/all/modules/figli/edlp_studio/readme.md @@ -0,0 +1,8 @@ +# Edlp Studio + +## Chutier + +TODO: get content types that could be added to chutier by settings ( maybe per each contenttypes settings ) + + +## Composition diff --git a/sites/all/modules/figli/edlp_studio/src/FilAccessControlHandler.php b/sites/all/modules/figli/edlp_studio/src/CompositionAccessControlHandler.php similarity index 59% rename from sites/all/modules/figli/edlp_studio/src/FilAccessControlHandler.php rename to sites/all/modules/figli/edlp_studio/src/CompositionAccessControlHandler.php index bbec46454..4ab5d4358 100644 --- a/sites/all/modules/figli/edlp_studio/src/FilAccessControlHandler.php +++ b/sites/all/modules/figli/edlp_studio/src/CompositionAccessControlHandler.php @@ -8,40 +8,40 @@ use Drupal\Core\Session\AccountInterface; use Drupal\Core\Access\AccessResult; /** - * Access controller for the Fil entity. + * Access controller for the Composition entity. * - * @see \Drupal\edlp_studio\Entity\Fil. + * @see \Drupal\edlp_studio\Entity\Composition. */ -class FilAccessControlHandler extends EntityAccessControlHandler { +class CompositionAccessControlHandler extends EntityAccessControlHandler { /** * {@inheritdoc} */ protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) { - /** @var \Drupal\edlp_studio\Entity\FilInterface $entity */ + /** @var \Drupal\edlp_studio\Entity\CompositionInterface $entity */ switch ($operation) { case 'view': if (!$entity->isPublished()) { - if($account->hasPermission('view own unpublished fil entities') && $account->isAuthenticated() && $account->id() == $entity->getOwnerId() ){ + if($account->hasPermission('view own unpublished composition entities') && $account->isAuthenticated() && $account->id() == $entity->getOwnerId() ){ return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity); }else{ - return AccessResult::allowedIfHasPermission($account, 'view any unpublished fil entities'); + return AccessResult::allowedIfHasPermission($account, 'view any unpublished composition entities'); } } - return AccessResult::allowedIfHasPermission($account, 'view published fil entities'); + return AccessResult::allowedIfHasPermission($account, 'view published composition entities'); case 'update': - if($account->hasPermission('edit own fil entities') && $account->isAuthenticated() && $account->id() == $entity->getOwnerId() ){ + if($account->hasPermission('edit own composition entities') && $account->isAuthenticated() && $account->id() == $entity->getOwnerId() ){ return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity); }else{ - return AccessResult::allowedIfHasPermission($account, 'edit any fil entities'); + return AccessResult::allowedIfHasPermission($account, 'edit any composition entities'); } case 'delete': - if($account->hasPermission('delete own fil entities') && $account->isAuthenticated() && $account->id() == $entity->getOwnerId() ){ + if($account->hasPermission('delete own composition entities') && $account->isAuthenticated() && $account->id() == $entity->getOwnerId() ){ return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity); }else{ - return AccessResult::allowedIfHasPermission($account, 'delete fil entities'); + return AccessResult::allowedIfHasPermission($account, 'delete composition entities'); } } @@ -53,7 +53,7 @@ class FilAccessControlHandler extends EntityAccessControlHandler { * {@inheritdoc} */ protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) { - return AccessResult::allowedIfHasPermission($account, 'add fil entities'); + return AccessResult::allowedIfHasPermission($account, 'add composition entities'); } } diff --git a/sites/all/modules/figli/edlp_studio/src/FilHtmlRouteProvider.php b/sites/all/modules/figli/edlp_studio/src/CompositionHtmlRouteProvider.php similarity index 88% rename from sites/all/modules/figli/edlp_studio/src/FilHtmlRouteProvider.php rename to sites/all/modules/figli/edlp_studio/src/CompositionHtmlRouteProvider.php index 9084e8edd..53778954a 100644 --- a/sites/all/modules/figli/edlp_studio/src/FilHtmlRouteProvider.php +++ b/sites/all/modules/figli/edlp_studio/src/CompositionHtmlRouteProvider.php @@ -7,12 +7,12 @@ use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider; use Symfony\Component\Routing\Route; /** - * Provides routes for Fil entities. + * Provides routes for Composition entities. * * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider */ -class FilHtmlRouteProvider extends AdminHtmlRouteProvider { +class CompositionHtmlRouteProvider extends AdminHtmlRouteProvider { /** * {@inheritdoc} @@ -43,7 +43,7 @@ class FilHtmlRouteProvider extends AdminHtmlRouteProvider { $route = new Route("/admin/structure/studio/{$entity_type->id()}/settings"); $route ->setDefaults([ - '_form' => 'Drupal\edlp_studio\Form\FilSettingsForm', + '_form' => 'Drupal\edlp_studio\Form\CompositionSettingsForm', '_title' => "{$entity_type->getLabel()} settings", ]) ->setRequirement('_permission', $entity_type->getAdminPermission()) diff --git a/sites/all/modules/figli/edlp_studio/src/FilListBuilder.php b/sites/all/modules/figli/edlp_studio/src/CompositionListBuilder.php similarity index 65% rename from sites/all/modules/figli/edlp_studio/src/FilListBuilder.php rename to sites/all/modules/figli/edlp_studio/src/CompositionListBuilder.php index 1c084046c..42260aaca 100644 --- a/sites/all/modules/figli/edlp_studio/src/FilListBuilder.php +++ b/sites/all/modules/figli/edlp_studio/src/CompositionListBuilder.php @@ -7,18 +7,18 @@ use Drupal\Core\Entity\EntityListBuilder; use Drupal\Core\Link; /** - * Defines a class to build a listing of Fil entities. + * Defines a class to build a listing of Composition entities. * * @ingroup edlp_studio */ -class FilListBuilder extends EntityListBuilder { +class CompositionListBuilder extends EntityListBuilder { /** * {@inheritdoc} */ public function buildHeader() { - $header['id'] = $this->t('Fil ID'); + $header['id'] = $this->t('Composition ID'); $header['name'] = $this->t('Name'); return $header + parent::buildHeader(); } @@ -27,12 +27,12 @@ class FilListBuilder extends EntityListBuilder { * {@inheritdoc} */ public function buildRow(EntityInterface $entity) { - /* @var $entity \Drupal\edlp_studio\Entity\Fil */ + /* @var $entity \Drupal\edlp_studio\Entity\Composition */ $row['id'] = $entity->id(); $row['name'] = Link::createFromRoute( $entity->label(), - 'entity.fil.edit_form', - ['fil' => $entity->id()] + 'entity.composition.edit_form', + ['composition' => $entity->id()] ); return $row + parent::buildRow($entity); } diff --git a/sites/all/modules/figli/edlp_studio/src/Controller/ChutierController.php b/sites/all/modules/figli/edlp_studio/src/Controller/ChutierController.php new file mode 100644 index 000000000..9d225876f --- /dev/null +++ b/sites/all/modules/figli/edlp_studio/src/Controller/ChutierController.php @@ -0,0 +1,40 @@ + 'Hello chutier', + ); + + $response->setData($data); + + return $response; + // return array( + // '#markup'=>'Hello Chutier' + // ); } + } + +} diff --git a/sites/all/modules/figli/edlp_studio/src/Entity/Chutier.php b/sites/all/modules/figli/edlp_studio/src/Entity/Chutier.php index 828f7fb70..e9e063f8f 100644 --- a/sites/all/modules/figli/edlp_studio/src/Entity/Chutier.php +++ b/sites/all/modules/figli/edlp_studio/src/Entity/Chutier.php @@ -216,6 +216,7 @@ class Chutier extends ContentEntityBase implements ChutierInterface { ->setDescription(t('Documents from collection.')) ->setSetting('target_type', 'node') ->setSetting('handler', 'default') + // TODO: check node content type by settings @see readme ->setSetting('handler_settings',['target_bundles'=>['enregistrement'=>'enregistrement']] ) ->setCardinality(BaseFieldDefinition::CARDINALITY_UNLIMITED) ->setDisplayOptions('view', array( diff --git a/sites/all/modules/figli/edlp_studio/src/Entity/Fil.php b/sites/all/modules/figli/edlp_studio/src/Entity/Composition.php similarity index 78% rename from sites/all/modules/figli/edlp_studio/src/Entity/Fil.php rename to sites/all/modules/figli/edlp_studio/src/Entity/Composition.php index 370366727..ea6038d71 100644 --- a/sites/all/modules/figli/edlp_studio/src/Entity/Fil.php +++ b/sites/all/modules/figli/edlp_studio/src/Entity/Composition.php @@ -10,31 +10,31 @@ use Drupal\Core\Entity\EntityTypeInterface; use Drupal\user\UserInterface; /** - * Defines the Fil entity. + * Defines the Composition entity. * * @ingroup edlp_studio * * @ContentEntityType( - * id = "fil", - * label = @Translation("Fil"), + * id = "composition", + * label = @Translation("Composition"), * handlers = { * "view_builder" = "Drupal\Core\Entity\EntityViewBuilder", - * "list_builder" = "Drupal\edlp_studio\FilListBuilder", - * "views_data" = "Drupal\edlp_studio\Entity\FilViewsData", + * "list_builder" = "Drupal\edlp_studio\CompositionListBuilder", + * "views_data" = "Drupal\edlp_studio\Entity\CompositionViewsData", * * "form" = { - * "default" = "Drupal\edlp_studio\Form\FilForm", - * "add" = "Drupal\edlp_studio\Form\FilForm", - * "edit" = "Drupal\edlp_studio\Form\FilForm", - * "delete" = "Drupal\edlp_studio\Form\FilDeleteForm", + * "default" = "Drupal\edlp_studio\Form\CompositionForm", + * "add" = "Drupal\edlp_studio\Form\CompositionForm", + * "edit" = "Drupal\edlp_studio\Form\CompositionForm", + * "delete" = "Drupal\edlp_studio\Form\CompositionDeleteForm", * }, - * "access" = "Drupal\edlp_studio\FilAccessControlHandler", + * "access" = "Drupal\edlp_studio\CompositionAccessControlHandler", * "route_provider" = { - * "html" = "Drupal\edlp_studio\FilHtmlRouteProvider", + * "html" = "Drupal\edlp_studio\CompositionHtmlRouteProvider", * }, * }, - * base_table = "fil", - * admin_permission = "administer fil entities", + * base_table = "composition", + * admin_permission = "administer composition entities", * entity_keys = { * "id" = "id", * "label" = "name", @@ -44,16 +44,16 @@ use Drupal\user\UserInterface; * "status" = "status", * }, * links = { - * "canonical" = "/admin/structure/studio/fil/{fil}", - * "add-form" = "/admin/structure/studio/fil/add", - * "edit-form" = "/admin/structure/studio/fil/{fil}/edit", - * "delete-form" = "/admin/structure/studio/fil/{fil}/delete", - * "collection" = "/admin/structure/studio/fil", + * "canonical" = "/admin/structure/studio/composition/{composition}", + * "add-form" = "/admin/structure/studio/composition/add", + * "edit-form" = "/admin/structure/studio/composition/{composition}/edit", + * "delete-form" = "/admin/structure/studio/composition/{composition}/delete", + * "collection" = "/admin/structure/studio/composition", * }, - * field_ui_base_route = "fil.settings" + * field_ui_base_route = "composition.settings" * ) */ -class Fil extends ContentEntityBase implements FilInterface { +class Composition extends ContentEntityBase implements CompositionInterface { use EntityChangedTrait; @@ -150,7 +150,7 @@ class Fil extends ContentEntityBase implements FilInterface { $fields['user_id'] = BaseFieldDefinition::create('entity_reference') ->setLabel(t('Authored by')) - ->setDescription(t('The user ID of author of the Fil entity.')) + ->setDescription(t('The user ID of author of the Composition entity.')) ->setRevisionable(TRUE) ->setSetting('target_type', 'user') ->setSetting('handler', 'default') @@ -175,7 +175,7 @@ class Fil extends ContentEntityBase implements FilInterface { $fields['name'] = BaseFieldDefinition::create('string') ->setLabel(t('Name')) - ->setDescription(t('The name of the Fil entity.')) + ->setDescription(t('The name of the Composition entity.')) ->setSettings([ 'max_length' => 50, 'text_processing' => 0, @@ -196,7 +196,7 @@ class Fil extends ContentEntityBase implements FilInterface { $fields['status'] = BaseFieldDefinition::create('boolean') ->setLabel(t('Publishing status')) - ->setDescription(t('A boolean indicating whether the Fil is published.')) + ->setDescription(t('A boolean indicating whether the Composition is published.')) ->setDefaultValue(TRUE) ->setDisplayOptions('form', [ 'type' => 'boolean_checkbox', diff --git a/sites/all/modules/figli/edlp_studio/src/Entity/CompositionInterface.php b/sites/all/modules/figli/edlp_studio/src/Entity/CompositionInterface.php new file mode 100644 index 000000000..73bd35394 --- /dev/null +++ b/sites/all/modules/figli/edlp_studio/src/Entity/CompositionInterface.php @@ -0,0 +1,77 @@ +entity; @@ -34,17 +34,17 @@ class FilForm extends ContentEntityForm { switch ($status) { case SAVED_NEW: - drupal_set_message($this->t('Created the %label Fil.', [ + drupal_set_message($this->t('Created the %label Composition.', [ '%label' => $entity->label(), ])); break; default: - drupal_set_message($this->t('Saved the %label Fil.', [ + drupal_set_message($this->t('Saved the %label Composition.', [ '%label' => $entity->label(), ])); } - $form_state->setRedirect('entity.fil.canonical', ['fil' => $entity->id()]); + $form_state->setRedirect('entity.composition.canonical', ['composition' => $entity->id()]); } } diff --git a/sites/all/modules/figli/edlp_studio/src/Form/FilSettingsForm.php b/sites/all/modules/figli/edlp_studio/src/Form/CompositionSettingsForm.php similarity index 78% rename from sites/all/modules/figli/edlp_studio/src/Form/FilSettingsForm.php rename to sites/all/modules/figli/edlp_studio/src/Form/CompositionSettingsForm.php index f5f4336f3..9a20d03fb 100644 --- a/sites/all/modules/figli/edlp_studio/src/Form/FilSettingsForm.php +++ b/sites/all/modules/figli/edlp_studio/src/Form/CompositionSettingsForm.php @@ -6,11 +6,11 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; /** - * Class FilSettingsForm. + * Class CompositionSettingsForm. * * @ingroup edlp_studio */ -class FilSettingsForm extends FormBase { +class CompositionSettingsForm extends FormBase { /** * Returns a unique string identifying the form. @@ -19,7 +19,7 @@ class FilSettingsForm extends FormBase { * The unique string identifying the form. */ public function getFormId() { - return 'fil_settings'; + return 'composition_settings'; } /** @@ -35,7 +35,7 @@ class FilSettingsForm extends FormBase { } /** - * Defines the settings form for Fil entities. + * Defines the settings form for Composition entities. * * @param array $form * An associative array containing the structure of the form. @@ -46,7 +46,7 @@ class FilSettingsForm extends FormBase { * Form definition array. */ public function buildForm(array $form, FormStateInterface $form_state) { - $form['fil_settings']['#markup'] = 'Settings form for Fil entities. Manage field settings here.'; + $form['composition_settings']['#markup'] = 'Settings form for Composition entities. Manage field settings here.'; return $form; } diff --git a/sites/all/modules/figli/edlp_studio/templates/fil.html.twig b/sites/all/modules/figli/edlp_studio/templates/Composition.html.twig similarity index 53% rename from sites/all/modules/figli/edlp_studio/templates/fil.html.twig rename to sites/all/modules/figli/edlp_studio/templates/Composition.html.twig index fef7ae57f..0afc29dde 100644 --- a/sites/all/modules/figli/edlp_studio/templates/fil.html.twig +++ b/sites/all/modules/figli/edlp_studio/templates/Composition.html.twig @@ -1,21 +1,21 @@ {# /** - * @file fil.html.twig - * Default theme implementation to present Fil data. + * @file composition.html.twig + * Default theme implementation to present Composition data. * - * This template is used when viewing Fil pages. + * This template is used when viewing Composition pages. * * * Available variables: * - content: A list of content items. Use 'content' to print all content, or * - attributes: HTML attributes for the container element. * - * @see template_preprocess_fil() + * @see template_preprocess_composition() * * @ingroup themeable */ #} -