Merge branch 'dev' of ssh://git.autonomic.zone:2222/autonomic-cooperative/opencase into dev

modules/opencase_cases/opencase_cases.module

@@ -66,14 +66,13 @@ function opencase_cases_entity_base_field_info($entity_type) {
   return $fields;
 }
 
-/**
+/* When creating an activity, it sets the case id from the URL.
- * When creating an activity, it sets the case id from the URL.
+/*/
- */
+public static function opencase_cases_default_activity_case_value() {
-function opencase_cases_default_activity_case_value() {
+ return array(\Drupal::request()->query->get('case_id'));
-  return array(\Drupal::request()->query->get('case_id'));
 }
 
-/**
+ /**
  * Implementation of hook_form_alter()
  * Changes what page is redirected to after deleting things
  */
@@ -86,31 +85,31 @@ function opencase_cases_form_alter(&$form, &$form_state, $form_id) {
     $form['actions']['submit']['#submit'][] = '_opencase_cases_delete_activity_redirect';
     $form['actions']['cancel']['#url'] = $form_state->getFormObject()->getEntity()->toUrl();
   }
-}
+} 
-
+ 
 function _opencase_cases_redirect_to_home($form, &$form_state) {
   $form_state->setRedirect('<front>'); 
-}
+ 
 function _opencase_cases_delete_activity_redirect($form, &$form_state) {
   $case_id = $form_state->getFormObject()->getEntity()->oc_case->target_id;
   $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $case_id]);
-}
+ 
 /**
-* Implements hook_theme_suggestions_HOOK().
+ * Implements hook_theme_suggestions_HOOK().
-*/
+ */
 function opencase_cases_theme_suggestions_oc_case(array $variables) {
   $suggestions = [];
   $entity = $variables['elements']['#oc_case'];
   $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
-
+ 
   $suggestions[] = 'oc_case__' . $sanitized_view_mode;
   $suggestions[] = 'oc_case__' . $entity->bundle();
   $suggestions[] = 'oc_case__' . $entity->bundle() . '__' . $sanitized_view_mode;
   $suggestions[] = 'oc_case__' . $entity->id();
   $suggestions[] = 'oc_case__' . $entity->id() . '__' . $sanitized_view_mode;
   return $suggestions;
-}
+} 
-
+ 
 function opencase_views_query_alter(Drupal\views\ViewExecutable $view, $query) {
   if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_case') {
     $query->addTag('oc_case_access');
@@ -118,8 +117,8 @@ function opencase_views_query_alter(Drupal\views\ViewExecutable $view, $query) {
   if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_activity') {
     $query->addTag('oc_activity_access');
   }
-}
+} 
-
+ 
 function opencase_query_oc_case_access_alter($query) {
   if (\Drupal::currentUser()->hasPermission('view published case entities')) {
     return;
@@ -127,8 +126,8 @@ function opencase_query_oc_case_access_alter($query) {
   $linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
   $query->addJoin('INNER', 'oc_case__actors_involved', 'access_filter', 'access_filter.entity_id = oc_case_field_data.id');
   $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
-}
+} 
-
+ 
 function opencase_query_oc_activity_access_alter($query) {
   if (\Drupal::currentUser()->hasPermission('view published case entities')) {
     return;
@@ -136,4 +135,4 @@ function opencase_query_oc_activity_access_alter($query) {
   $linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
   $query->addJoin('INNER', 'oc_case__actors_involved', 'access_filter', 'access_filter.entity_id = oc_activity_field_data.oc_case');
   $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
-}
+}