Merge branch 'demo' of ssh://git.autonomic.zone:2222/autonomic-cooperative/opencase into demo
This commit is contained in:
commit
80f86c62fd
@ -121,32 +121,32 @@ function opencase_cases_theme_suggestions_oc_case(array $variables) {
|
|||||||
return $suggestions;
|
return $suggestions;
|
||||||
}
|
}
|
||||||
|
|
||||||
function opencase_views_query_alter(Drupal\views\ViewExecutable $view, $query) {
|
//function opencase_views_query_alter(Drupal\views\ViewExecutable $view, $query) {
|
||||||
if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_case') {
|
// if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_case') {
|
||||||
$query->addTag('oc_case_access');
|
// $query->addTag('oc_case_access');
|
||||||
}
|
// }
|
||||||
if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_activity') {
|
// if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_activity') {
|
||||||
$query->addTag('oc_activity_access');
|
// $query->addTag('oc_activity_access');
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
//
|
||||||
function opencase_query_oc_case_access_alter($query) {
|
//function opencase_query_oc_case_access_alter($query) {
|
||||||
if (\Drupal::currentUser()->hasPermission('view published case entities')) {
|
// if (\Drupal::currentUser()->hasPermission('view published case entities')) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
$linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
|
// $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->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);
|
// $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
|
||||||
}
|
//}
|
||||||
|
//
|
||||||
function opencase_query_oc_activity_access_alter($query) {
|
//function opencase_query_oc_activity_access_alter($query) {
|
||||||
if (\Drupal::currentUser()->hasPermission('view published case entities')) {
|
// if (\Drupal::currentUser()->hasPermission('view published case entities')) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
$linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
|
// $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->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);
|
// $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
|
||||||
}
|
//}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implements hook_theme_suggestions_HOOK().
|
* Implements hook_theme_suggestions_HOOK().
|
||||||
|
Reference in New Issue
Block a user