Merge branch '1.7' into 1.8

ezecosystem · Jul 28, 2017 · a3a63c9 · a3a63c9
2 parents 906c02e + 422fba2
commit a3a63c9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/bundle/Resources/views/Limitation/udw_limitation_value.html.twig b/bundle/Resources/views/Limitation/udw_limitation_value.html.twig
@@ -9,9 +9,9 @@
 >{{ "role.policy.limitation.location.udw_button"|trans({}, "ezrepoforms_role") }}</button>
 <div>
     <ul id="{{form.limitationValues.vars.id}}-selected-location">
-        {% for limitationValue in form.limitationValues.vars.value %}
+        {% for limitationValue in form.limitationValues.vars.value|split(',') %}
         <li>
-            {{ render( controller( "ez_content:view", {'contentId': limitationValue, 'viewType': '_platformui_content_name'} ) ) }}
+            {{ render( controller( "ez_content:viewAction", {'locationId': limitationValue, 'viewType': '_platformui_content_name'} ) ) }}
         </li>
         {% endfor %}
     </ul>

diff --git a/lib/Limitation/DataTransformer/UDWBasedValueTransformer.php b/lib/Limitation/DataTransformer/UDWBasedValueTransformer.php
@@ -24,7 +24,12 @@ public function transform($value)
             return null;
         }
 
-        return implode(',', $value);
+        $locations = [];
+        foreach ($value as $key => $path) {
+            $locations[] = $this->extractLocationIdFromPath($path);
+        }
+
+        return implode(',', $locations);
     }
 
     public function reverseTransform($value)
@@ -35,4 +40,18 @@ public function reverseTransform($value)
 
         return explode(',', $value);
     }
+
+    /**
+     * Extracts and returns an item id from a path, e.g. /1/2/58 => 58.
+     *
+     * @param string $path
+     *
+     * @return mixed
+     */
+    private function extractLocationIdFromPath($path)
+    {
+        $pathParts = explode('/', trim($path, '/'));
+
+        return array_pop($pathParts);
+    }
 }
diff --git a/lib/Validator/Constraints/UniqueRoleIdentifierValidator.php b/lib/Validator/Constraints/UniqueRoleIdentifierValidator.php
@@ -36,7 +36,7 @@ public function __construct(RoleService $roleService)
      */
     public function validate($value, Constraint $constraint)
     {
-        if (!$value instanceof RoleData) {
+        if (!$value instanceof RoleData || $value->identifier === null) {
             return;
         }
 

diff --git a/tests/RepositoryForms/Validator/Constraints/UniqueRoleIdentifierValidatorTest.php b/tests/RepositoryForms/Validator/Constraints/UniqueRoleIdentifierValidatorTest.php
@@ -61,6 +61,19 @@ public function testNotRoleData()
         $this->validator->validate($value, new UniqueRoleIdentifier());
     }
 
+    public function testNullRoleIdentifier()
+    {
+        $value = new RoleData(['identifier' => null]);
+        $this->roleService
+            ->expects($this->never())
+            ->method('loadRoleByIdentifier');
+        $this->executionContext
+            ->expects($this->never())
+            ->method('buildViolation');
+
+        $this->validator->validate($value, new UniqueRoleIdentifier());
+    }
+
     public function testValid()
     {
         $identifier = 'foo_identifier';