When creating case, first actor is set from URL

And the contextual menu adds the query string
This commit is contained in:
naomi 2018-04-30 15:45:34 +02:00
parent fc1ae79562
commit 3b7e8c9cbe
2 changed files with 34 additions and 7 deletions

View File

@ -72,6 +72,15 @@ use Drupal\user\UserInterface;
*/ */
class OCCase extends RevisionableContentEntityBase implements OCCaseInterface { class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
/**
* When creating a case, it sets the first involved party to the actor
* id from the URL.
*/
public static function defaultVal() {
return \Drupal::request()->query->get('actor_id');;
}
use EntityChangedTrait; use EntityChangedTrait;
/** /**
@ -250,6 +259,8 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
->setDisplayConfigurable('view', TRUE) ->setDisplayConfigurable('view', TRUE)
->setRequired(TRUE); ->setRequired(TRUE);
$fields['actors_involved'] = BaseFieldDefinition::create('entity_reference') $fields['actors_involved'] = BaseFieldDefinition::create('entity_reference')
->setLabel(t('Involved Parties')) ->setLabel(t('Involved Parties'))
->setDescription(t('People involved in this case, in their various capacities')) ->setDescription(t('People involved in this case, in their various capacities'))
@ -267,6 +278,7 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
'placeholder' => '', 'placeholder' => '',
], ],
]) ])
->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCCase::defaultVal')
->setRequired(TRUE); ->setRequired(TRUE);
$fields['status'] = BaseFieldDefinition::create('boolean') $fields['status'] = BaseFieldDefinition::create('boolean')
@ -296,5 +308,4 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
return $fields; return $fields;
} }
} }

View File

@ -4,6 +4,7 @@ namespace Drupal\opencase\Plugin\Block;
use Drupal\Core\Block\BlockBase; use Drupal\Core\Block\BlockBase;
use Drupal\Core\Link; use Drupal\Core\Link;
use Drupal\Core\Url;
/** /**
* Provides a 'ContextualMenu' block. * Provides a 'ContextualMenu' block.
@ -21,7 +22,6 @@ class ContextualMenu extends BlockBase {
public function build() { public function build() {
$route_name = \Drupal::routeMatch()->getRouteName(); $route_name = \Drupal::routeMatch()->getRouteName();
error_log($route_name);
switch ($route_name) { switch ($route_name) {
case 'entity.oc_actor.canonical': case 'entity.oc_actor.canonical':
$markup = $this->actorPage(); $markup = $this->actorPage();
@ -33,7 +33,7 @@ class ContextualMenu extends BlockBase {
$build = []; $build = [];
$build['contextual_menu'] = [ $build['contextual_menu'] = [
'#markup' => $markup, '#markup' => "<div id='opencase_contextual_menu'>$markup</div",
'#cache' => ['max-age' => 0] '#cache' => ['max-age' => 0]
]; ];
return $build; return $build;
@ -42,21 +42,37 @@ class ContextualMenu extends BlockBase {
/** /**
* Contextual menu for Actor page * Contextual menu for Actor page
* - Link to case list for that actor
*/ */
private function actorPage() { private function actorPage() {
$actor = \Drupal::routeMatch()->getParameter('oc_actor'); $actor = \Drupal::routeMatch()->getParameter('oc_actor');
$linkText = 'Case List'; $url = Url::fromRoute('view.cases.page_1', array('actor_id' => $actor->id()));
$url = '/opencase/oc_actor/'.$actor->id().'/case_list'; $link = Link::fromTextAndUrl(t("Case List"), $url)->toString();
return "<a href='$url'>$linkText</a>"; return "<div id='opencase_contextual_menu_nav'><p>$link</p></div>";
} }
/** /**
* Contextual menu for Case list page * Contextual menu for Case list page
* - Link to the actor that the case list is for
* - Links to add cases of various types
*/ */
private function caseListPage() { private function caseListPage() {
$actor_id = \Drupal::routeMatch()->getParameter('actor_id'); $actor_id = \Drupal::routeMatch()->getParameter('actor_id');
$actor = \Drupal::entityTypeManager()->getStorage('oc_actor')->load($actor_id); $actor = \Drupal::entityTypeManager()->getStorage('oc_actor')->load($actor_id);
return $actor->toLink()->toString(); $link = $actor->toLink()->toString();
$markup = "<div id='opencase_contextual_menu_nav'><p>$link</p></div>";
$case_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_case');
$add_links = '';
foreach($case_types as $case_type_id => $type) {
$label = $type['label'];
$url = Url::fromRoute('entity.oc_case.add_form', ['oc_case_type' => $case_type_id]);
$url->setOption('query', ['actor_id' => $actor_id]);
$link = Link::fromTextAndUrl(t("Add a $label case"), $url)->toString();
$add_links .= "<p>$link</p>";
}
$markup .= "<div id='opencase_contextual_menu_add'>$add_links</div>";
return $markup;
} }
/** /**