Revert "Merge branch 'develop' into 'ci'"

This reverts merge request !47

web/modules/custom/emergya/src/Services/AccessControl.php

@@ -100,18 +100,6 @@ public function _getZones($account){
     return $zonas;
   }
 
-  public function is_zone($account,$drop){
-    $zone_drop = $drop->get('field_drop_location')->getValue()[0]['target_id'];
-    $group_zones_allowed = $this->_getZones($account);
-    if (in_array($zone_drop, $group_zones_allowed)) {
-      return true;
-    }
-    else {
-      return false;
-    }
-    return false;
-  }
-
   public function isFunder($drop){
     if (is_object($drop)) {
       $memberGroups = $this->_getMemberGroup($this->currentUser);

web/modules/custom/emergya_relation_groups/emergya_relation_groups.module

@@ -401,9 +401,6 @@ function emergya_relation_groups_preprocess_views_view_field(&$variables)
     if (!$access_service->isFunder($drop) && in_array('provider', \Drupal::currentUser()->getRoles())
       && !in_array('installer', \Drupal::currentUser()->getRoles()) ){
       $variables['output'] = '';
-    }elseif (!$access_service->isFunder($drop) && in_array('provider', \Drupal::currentUser()->getRoles())
-      && in_array('installer', \Drupal::currentUser()->getRoles()) && !$access_service->is_zone(\Drupal::currentUser(),$drop)){
-      $variables['output'] = '';
     }/*
     elseif (in_array('installer', \Drupal::currentUser()->getRoles())){