- {% for field in form.children %}
- {{ _self.address_collection_prototype(field) }}
- {% endfor %}
+
+ {{ _self.oro_item_collection_validate_primary_js(_context) }}
+ {% endspaceless %}
+{% endblock %}
+
+{% macro oro_item_collection_validate_primary_js(context) %}
+ {% set form = context.form %}
+ {% set show_form_when_empty = context.show_form_when_empty %}
+ {% set id = context.id %}
+ {% set has_primary = form.vars.prototype.primary is defined %}
+ {% set has_types = form.vars.prototype.types is defined %}
+ {% if has_primary or has_types or show_form_when_empty %}
- {% endspaceless %}
-{% endblock oro_address_collection_widget %}
+ {% endif %}
+{% endmacro %}
diff --git a/src/Oro/Bundle/AddressBundle/Resources/views/Include/viewMacro.html.twig b/src/Oro/Bundle/AddressBundle/Resources/views/Include/viewMacro.html.twig
index 1513fd46edf..156fc302be5 100644
--- a/src/Oro/Bundle/AddressBundle/Resources/views/Include/viewMacro.html.twig
+++ b/src/Oro/Bundle/AddressBundle/Resources/views/Include/viewMacro.html.twig
@@ -16,20 +16,10 @@
{{ __.renderAddressView(address, fields) }}
{% endmacro %}
-{% macro renderAddressView(address, fields, renderFlexibleAttributes) %}
- {# Render flexible attributes by default #}
- {% set renderFlexibleAttributes = renderFlexibleAttributes|default(true) %}
-
- {# Render static attributes #}
+{% macro renderAddressView(address, fields) %}
{% for field in fields %}
{{ block('addressStaticAttribute') }}
{% endfor %}
-
- {# Render flexible attributes #}
- {% import 'OroUIBundle::macros.html.twig' as UI %}
- {% for value in address|getAttributes() %}
- {{ UI.flexibleAttributeRow(value) }}
- {% endfor %}
{% endmacro %}
{% block addressStaticAttribute %}
diff --git a/src/Oro/Bundle/AddressBundle/Resources/views/Js/address.js.twig b/src/Oro/Bundle/AddressBundle/Resources/views/Js/address.js.twig
new file mode 100644
index 00000000000..567be1b1367
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Resources/views/Js/address.js.twig
@@ -0,0 +1,22 @@
+
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php
index 364118f64b3..9f87311a5f8 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestAddressTypeApiTest.php
@@ -16,11 +16,7 @@ class RestAddressTypeApiTest extends WebTestCase
public function setUp()
{
- if (!isset($this->client)) {
- $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
- } else {
- $this->client->restart();
- }
+ $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
}
/**
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestApiTest.php b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestApiTest.php
index 4fe28e10a70..1a82081ea12 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestApiTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/RestApiTest.php
@@ -18,11 +18,7 @@ class RestApiTest extends WebTestCase
public function setUp()
{
- if (!isset($this->client)) {
- $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
- } else {
- $this->client->restart();
- }
+ $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
}
/**
@@ -85,6 +81,31 @@ public function testGetAddress($id)
$this->assertEquals($id, $resultJson['id']);
}
+ /**
+ * Test GET
+ *
+ * @depends testCreateAddress
+ */
+ public function testGetAddresses($id)
+ {
+ $this->client->request(
+ 'GET',
+ $this->client->generate('oro_api_get_addresses')
+ );
+
+ /** @var $result Response */
+ $result = $this->client->getResponse();
+
+ ToolsAPI::assertJsonResponse($result, 200);
+ $resultJson = json_decode($result->getContent(), true);
+
+ $this->assertNotEmpty($resultJson);
+ $this->assertArrayHasKey(0, $resultJson);
+ $this->assertArrayHasKey('id', $resultJson[0]);
+
+ $this->assertEquals($id, $resultJson[0]['id']);
+ }
+
/**
* Test PUT
*
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapAddressTypeApiTest.php b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapAddressTypeApiTest.php
index 591ac0972e8..956e791de61 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapAddressTypeApiTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapAddressTypeApiTest.php
@@ -16,19 +16,14 @@ class SoapAddressTypeApiTest extends WebTestCase
public function setUp()
{
- if (!isset($this->client)) {
- $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
- $this->client->soap(
- "http://localhost/api/soap",
- array(
- 'location' => 'http://localhost/api/soap',
- 'soap_version' => SOAP_1_2
- )
- );
- } else {
- $this->client->restart();
- }
-
+ $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
+ $this->client->soap(
+ "http://localhost/api/soap",
+ array(
+ 'location' => 'http://localhost/api/soap',
+ 'soap_version' => SOAP_1_2
+ )
+ );
}
/**
@@ -36,7 +31,7 @@ public function setUp()
*/
public function testGetAddressTypes()
{
- $result = $this->client->soapClient->getAddressTypes();
+ $result = $this->client->getSoap()->getAddressTypes();
$result = ToolsAPI::classToArray($result);
if (is_array(reset($result['item']))) {
$actualData = $result['item'];
@@ -55,7 +50,7 @@ public function testGetAddressTypes()
public function testGetAddressType($expected)
{
foreach ($expected as $addrType) {
- $result = $this->client->soapClient->getAddressType($addrType['name']);
+ $result = $this->client->getSoap()->getAddressType($addrType['name']);
$result = ToolsAPI::classToArray($result);
$this->assertNotEmpty($result);
$this->assertEquals($addrType, $result);
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapApiTest.php b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapApiTest.php
index d51e2b69265..fa6aa1c03b7 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapApiTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Functional/API/SoapApiTest.php
@@ -68,24 +68,21 @@ class SoapApiTest extends WebTestCase
public function setUp()
{
- if (!isset($this->client)) {
- $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
- $this->client->soap(
- "http://localhost/api/soap",
- array(
- 'location' => 'http://localhost/api/soap',
- 'soap_version' => SOAP_1_2
- )
- );
- } else {
- $this->client->restart();
- }
-
+ $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader());
+ $this->client->soap(
+ "http://localhost/api/soap",
+ array(
+ 'location' => 'http://localhost/api/soap',
+ 'soap_version' => SOAP_1_2
+ )
+ );
}
public function testCreateAddress()
{
- $this->assertTrue($this->client->soapClient->createAddress($this->addressData['Create Address Data']));
+ $id = $this->client->getSoap()->createAddress($this->addressData['Create Address Data']);
+ $this->assertInternalType('int', $id);
+ $this->assertGreaterThan(0, $id);
}
/**
@@ -94,7 +91,7 @@ public function testCreateAddress()
*/
public function testGetAddresses()
{
- $result = $this->client->soapClient->getAddresses();
+ $result = $this->client->getSoap()->getAddresses();
$result = ToolsAPI::classToArray($result);
if (is_array(reset($result['item']))) {
$actualData = $result['item'];
@@ -132,7 +129,7 @@ function ($a) {
*/
public function testGetAddress($id)
{
- $result = $this->client->soapClient->getAddress($id);
+ $result = $this->client->getSoap()->getAddress($id);
$actualData = ToolsAPI::classToArray($result);
unset($actualData['id']);
$this->assertEquals($this->addressData['Expected Address Data'], $actualData);
@@ -144,8 +141,8 @@ public function testGetAddress($id)
*/
public function testUpdateAddress($id)
{
- $this->assertTrue($this->client->soapClient->updateAddress($id, $this->addressData['Update Address Data']));
- $result = $this->client->soapClient->getAddress($id);
+ $this->assertTrue($this->client->getSoap()->updateAddress($id, $this->addressData['Update Address Data']));
+ $result = $this->client->getSoap()->getAddress($id);
$actualData = ToolsAPI::classToArray($result);
unset($actualData['id']);
$this->assertEquals($this->addressData['Expected Updated Address Data'], $actualData);
@@ -157,9 +154,9 @@ public function testUpdateAddress($id)
*/
public function testDeleteAddress($id)
{
- $this->assertTrue($this->client->soapClient->deleteAddress($id));
+ $this->assertTrue($this->client->getSoap()->deleteAddress($id));
$this->setExpectedException('SoapFault');
- $this->client->soapClient->getAddress($id);
+ $this->client->getSoap()->getAddress($id);
}
/**
@@ -167,7 +164,7 @@ public function testDeleteAddress($id)
*/
public function testGetCountries()
{
- $result = $this->client->soapClient->getCountries();
+ $result = $this->client->getSoap()->getCountries();
$result = ToolsAPI::classToArray($result);
return array_slice($result['item'], 0, 5);
}
@@ -179,7 +176,7 @@ public function testGetCountries()
public function testGetCountry($countries)
{
foreach ($countries as $country) {
- $result = $this->client->soapClient->getCountry($country['iso2Code']);
+ $result = $this->client->getSoap()->getCountry($country['iso2Code']);
$result = ToolsAPI::classToArray($result);
$this->assertEquals($country, $result);
}
@@ -190,7 +187,7 @@ public function testGetCountry($countries)
*/
public function testGetRegions()
{
- $result = $this->client->soapClient->getRegions();
+ $result = $this->client->getSoap()->getRegions();
$result = ToolsAPI::classToArray($result);
return array_slice($result['item'], 0, 5);
}
@@ -202,7 +199,7 @@ public function testGetRegions()
public function testGetRegion($regions)
{
foreach ($regions as $region) {
- $result = $this->client->soapClient->getRegion($region['combinedCode']);
+ $result = $this->client->getSoap()->getRegion($region['combinedCode']);
$result = ToolsAPI::classToArray($result);
$this->assertEquals($region, $result);
}
@@ -213,11 +210,11 @@ public function testGetRegion($regions)
*/
public function testGetCountryRegion()
{
- $result = $this->client->soapClient->getRegionByCountry('US');
+ $result = $this->client->getSoap()->getRegionByCountry('US');
$result = ToolsAPI::classToArray($result);
foreach ($result['item'] as $region) {
$region['country'] = $region['country']['name'];
- $expectedResult = $this->client->soapClient->getRegion($region['combinedCode']);
+ $expectedResult = $this->client->getSoap()->getRegion($region['combinedCode']);
$expectedResult = ToolsAPI::classToArray($expectedResult);
$this->assertEquals($expectedResult, $region);
}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractAddressTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractAddressTest.php
index d7155df5e3d..c22ae22c6a7 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractAddressTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractAddressTest.php
@@ -13,7 +13,7 @@ class AbstractAddressTest extends \PHPUnit_Framework_TestCase
*/
public function testSettersAndGetters($property, $value)
{
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
call_user_func_array(array($obj, 'set' . ucfirst($property)), array($value));
$this->assertEquals($value, call_user_func_array(array($obj, 'get' . ucfirst($property)), array()));
@@ -44,14 +44,14 @@ public function propertiesDataProvider()
'stateText' => array('stateText', 'test state'),
'postalCode' => array('postalCode', '12345'),
'country' => array('country', $countryMock),
- 'created' => array('created', new \DateTime()),
- 'updated' => array('updated', new \DateTime()),
+ 'created' => array('createdAt', new \DateTime()),
+ 'updated' => array('updatedAt', new \DateTime()),
);
}
public function testBeforeSave()
{
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
$obj->beforeSave();
$this->assertNotNull($obj->getCreatedAt());
@@ -65,7 +65,7 @@ public function testBeforeSave()
*/
public function testToString(array $actualData, $expected)
{
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
foreach ($actualData as $key => $value) {
$setter = 'set' . ucfirst($key);
@@ -129,7 +129,7 @@ protected function createMockRegion($name)
public function testStateText()
{
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
$region = $this->getMockBuilder('Oro\Bundle\AddressBundle\Entity\Region')
->disableOriginalConstructor()
->getMock();
@@ -147,7 +147,7 @@ public function testIsStateValidNoCountry()
$context->expects($this->never())
->method('addViolationAt');
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
$obj->isStateValid($context);
}
@@ -166,7 +166,7 @@ public function testIsStateValidNoRegion()
$context->expects($this->never())
->method('addViolationAt');
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
$obj->setCountry($country);
$obj->isStateValid($context);
}
@@ -197,14 +197,14 @@ public function testIsStateValid()
array('%country%' => 'Country')
);
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
$obj->setCountry($country);
$obj->isStateValid($context);
}
public function testIsEmpty()
{
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
$this->assertTrue($obj->isEmpty());
}
@@ -215,7 +215,7 @@ public function testIsEmpty()
*/
public function testIsNotEmpty($property, $value)
{
- $obj = $this->createAbstractAddress();
+ $obj = $this->createAddress();
call_user_func_array(array($obj, 'set' . ucfirst($property)), array($value));
$this->assertFalse($obj->isEmpty());
}
@@ -244,34 +244,46 @@ public function emptyCheckPropertiesDataProvider()
);
}
- public function testIsNotEmptyFlexible()
+ /**
+ * @dataProvider isEqualDataProvider
+ *
+ * @param AbstractAddress $one
+ * @param mixed $two
+ * @param bool $expectedResult
+ */
+ public function testIsEqual(AbstractAddress $one, $two, $expectedResult)
{
- $value = $this->getMock('Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexibleValue');
- $value->expects($this->once())
- ->method('getData')
- ->will($this->returnValue('not empty'));
-
- $obj = $this->createAbstractAddress();
- $obj->addValue($value);
- $this->assertFalse($obj->isEmpty());
+ $this->assertEquals($expectedResult, $one->isEqual($two));
}
- public function testIsEmptyFlexible()
+ /**
+ * @return array
+ */
+ public function isEqualDataProvider()
{
- $value = $this->getMock('Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexibleValue');
- $value->expects($this->once())
- ->method('getData');
+ $one = $this->createAddress();
- $obj = $this->createAbstractAddress();
- $obj->addValue($value);
- $this->assertTrue($obj->isEmpty());
+ return array(
+ array($one, $one, true),
+ array($this->createAddress(100), $this->createAddress(100), true),
+ array($this->createAddress(), $this->createAddress(), false),
+ array($this->createAddress(100), $this->createAddress(), false),
+ array($this->createAddress(), null, false),
+ );
}
/**
+ * @param int|null $id
* @return AbstractAddress|\PHPUnit_Framework_MockObject_MockObject
*/
- protected function createAbstractAddress()
+ protected function createAddress($id = null)
{
- return $this->getMockForAbstractClass('Oro\Bundle\AddressBundle\Entity\AbstractAddress');
+ $result = $this->getMockForAbstractClass('Oro\Bundle\AddressBundle\Entity\AbstractAddress');
+
+ if (null !== $id) {
+ $result->setId($id);
+ }
+
+ return $result;
}
}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractEmailTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractEmailTest.php
new file mode 100644
index 00000000000..98c20e5dabe
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractEmailTest.php
@@ -0,0 +1,77 @@
+email = $this->createEmail();
+ }
+
+ protected function tearDown()
+ {
+ unset($this->email);
+ }
+
+ public function testConstructor()
+ {
+ $this->email = $this->createEmail('email@example.com');
+
+ $this->assertEquals('email@example.com', $this->email->getEmail());
+ }
+
+ public function testId()
+ {
+ $this->assertNull($this->email->getId());
+ $this->email->setId(100);
+ $this->assertEquals(100, $this->email->getId());
+ }
+
+ public function testEmail()
+ {
+ $this->assertNull($this->email->getEmail());
+ $this->email->setEmail('email@example.com');
+ $this->assertEquals('email@example.com', $this->email->getEmail());
+ }
+
+ public function testToString()
+ {
+ $this->assertEquals('', (string)$this->email);
+ $this->email->setEmail('email@example.com');
+ $this->assertEquals('email@example.com', (string)$this->email);
+ }
+
+ public function testPrimary()
+ {
+ $this->assertFalse($this->email->isPrimary());
+ $this->email->setPrimary(true);
+ $this->assertTrue($this->email->isPrimary());
+ }
+
+ public function testIsEmpty()
+ {
+ $this->assertTrue($this->createEmail()->isEmpty());
+ $this->assertFalse($this->createEmail('foo@example.com')->isEmpty());
+ }
+
+ /**
+ * @param string|null $email
+ * @return AbstractEmail|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function createEmail($email = null)
+ {
+ $arguments = array();
+ if ($email) {
+ $arguments[] = $email;
+ }
+ return $this->getMockForAbstractClass('Oro\Bundle\AddressBundle\Entity\AbstractEmail', $arguments);
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractPhoneTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractPhoneTest.php
new file mode 100644
index 00000000000..f34db5ddd3d
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractPhoneTest.php
@@ -0,0 +1,77 @@
+phone = $this->createPhone();
+ }
+
+ protected function tearDown()
+ {
+ unset($this->phone);
+ }
+
+ public function testConstructor()
+ {
+ $this->phone = $this->createPhone('080011223355');
+
+ $this->assertEquals('080011223355', $this->phone->getPhone());
+ }
+
+ public function testId()
+ {
+ $this->assertNull($this->phone->getId());
+ $this->phone->setId(100);
+ $this->assertEquals(100, $this->phone->getId());
+ }
+
+ public function testPhone()
+ {
+ $this->assertNull($this->phone->getPhone());
+ $this->phone->setPhone('080011223355');
+ $this->assertEquals('080011223355', $this->phone->getPhone());
+ }
+
+ public function testToString()
+ {
+ $this->assertEquals('', (string)$this->phone);
+ $this->phone->setPhone('080011223355');
+ $this->assertEquals('080011223355', (string)$this->phone);
+ }
+
+ public function testPrimary()
+ {
+ $this->assertFalse($this->phone->isPrimary());
+ $this->phone->setPrimary(true);
+ $this->assertTrue($this->phone->isPrimary());
+ }
+
+ public function testIsEmpty()
+ {
+ $this->assertTrue($this->createPhone()->isEmpty());
+ $this->assertFalse($this->createPhone('00110011')->isEmpty());
+ }
+
+ /**
+ * @param string|null $phone
+ * @return AbstractPhone|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function createPhone($phone = null)
+ {
+ $arguments = array();
+ if ($phone) {
+ $arguments[] = $phone;
+ }
+ return $this->getMockForAbstractClass('Oro\Bundle\AddressBundle\Entity\AbstractPhone', $arguments);
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractTypedAddressTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractTypedAddressTest.php
index 9121f36146e..ea30d1a29e1 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractTypedAddressTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractTypedAddressTest.php
@@ -51,6 +51,21 @@ public function testGetTypeNames()
$this->assertEquals(array('billing', 'shipping'), $this->address->getTypeNames());
}
+ public function testGetTypeLabels()
+ {
+ $this->assertEquals(array(), $this->address->getTypeLabels());
+
+ $billing = new AddressType('billing');
+ $billing->setLabel('Billing');
+ $this->address->addType($billing);
+
+ $shipping = new AddressType('shipping');
+ $shipping->setLabel('Shipping');
+ $this->address->addType($shipping);
+
+ $this->assertEquals(array('Billing', 'Shipping'), $this->address->getTypeLabels());
+ }
+
public function testGetTypeByName()
{
$addressType = new AddressType('billing');
@@ -68,6 +83,15 @@ public function testHasTypeWithName()
$this->assertFalse($this->address->hasTypeWithName('shipping'));
}
+ public function testPrimary()
+ {
+ $this->assertFalse($this->address->isPrimary());
+
+ $this->address->setPrimary(true);
+
+ $this->assertTrue($this->address->isPrimary());
+ }
+
public function testRemoveType()
{
$type = new AddressType('testAddressType');
@@ -77,4 +101,14 @@ public function testRemoveType()
$this->address->removeType($type);
$this->assertEmpty($this->address->getTypes()->toArray());
}
+
+ public function testIsEmpty()
+ {
+ $this->assertTrue($this->address->isEmpty());
+ $this->address->setPrimary(true);
+ $this->assertFalse($this->address->isEmpty());
+ $this->address->setPrimary(false);
+ $this->address->addType(new AddressType('billing'));
+ $this->assertFalse($this->address->isEmpty());
+ }
}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AddressTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AddressTypeTest.php
index 2ef7c2a70bd..145c36767ef 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AddressTypeTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AddressTypeTest.php
@@ -7,30 +7,44 @@
class AddressTypeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @dataProvider provider
- * @param string $property
+ * @var AddressType
*/
- public function testSettersAndGetters($property)
+ protected $type;
+
+ protected function setUp()
+ {
+ $this->type = new AddressType('billing');
+ }
+
+ public function testName()
{
- $name = 'testName';
- $obj = new AddressType($name);
+ $this->assertEquals('billing', $this->type->getName());
+ }
+
+ public function testLabel()
+ {
+ $this->assertNull($this->type->getLabel());
- call_user_func_array(array($obj, 'set' . ucfirst($property)), array($name));
- $this->assertEquals($name, call_user_func_array(array($obj, 'get' . ucfirst($property)), array()));
+ $this->type->setLabel('Billing');
- $this->assertEquals($name, $obj->getName());
+ $this->assertEquals('Billing', $this->type->getLabel());
}
- /**
- * Data provider
- *
- * @return array
- */
- public function provider()
+ public function testLocale()
+ {
+ $this->assertNull($this->type->getLocale());
+
+ $this->type->setLocale('en');
+
+ $this->assertEquals('en', $this->type->getLocale());
+ }
+
+ public function testToString()
{
- return array(
- array('label'),
- array('locale')
- );
+ $this->assertEquals('', $this->type);
+
+ $this->type->setLabel('Shipping');
+
+ $this->assertEquals('Shipping', (string)$this->type);
}
}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/Manager/AddressManagerTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/Manager/AddressManagerTest.php
index e8c3bc1bd5f..463a20998ed 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/Manager/AddressManagerTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/Manager/AddressManagerTest.php
@@ -4,25 +4,18 @@
use Oro\Bundle\AddressBundle\Entity\Manager\AddressManager;
use Oro\Bundle\AddressBundle\Entity\Address;
-use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager;
-use Doctrine\Common\Persistence\ObjectManager;
class AddressManagerTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var ObjectManager
+ * @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $om;
- /**
- * @var FlexibleManager
- */
- protected $fm;
-
/**
* @var string
*/
- protected $class;
+ protected $class = 'Oro\Bundle\AddressBundle\Entity\Address';
/**
* @var AddressManager
@@ -35,10 +28,6 @@ class AddressManagerTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->om = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
- $this->fm = $this->getMockBuilder('Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager')
- ->disableOriginalConstructor()
- ->getMock();
- $this->class = 'Oro\Bundle\AddressBundle\Entity\Address';
$classMetaData = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
->disableOriginalConstructor()
@@ -55,7 +44,7 @@ public function setUp()
->with($this->equalTo($this->class))
->will($this->returnValue($classMetaData));
- $this->addressManager = new AddressManager($this->class, $this->om, $this->fm);
+ $this->addressManager = new AddressManager($this->class, $this->om);
}
/**
@@ -126,54 +115,6 @@ public function testQueryMethods()
$this->assertEquals($this->addressManager->findAddressBy($addressCriteria), $address);
}
- /**
- * Test magic call methods for existing flexible manager methods
- */
- public function testCall()
- {
- $this->fm
- ->expects($this->once())
- ->method('getFlexibleName')
- ->will($this->returnValue(1));
-
- $this->assertEquals($this->addressManager->getFlexibleName(), 1);
- }
-
- /**
- * Testing exception on not existing method in address manager
- *
- * @expectedException \RuntimeException
- */
- public function testCallException()
- {
- $this->addressManager->NotExistingMethod();
- }
-
- public function testListQuery()
- {
- $limit = 1;
- $offset = 10;
- $paginator = $this->getMockBuilder('Doctrine\ORM\Tools\Pagination\Paginator')
- ->disableOriginalConstructor()
- ->getMock();
-
- $repo = $this->getMockBuilder('Oro\Bundle\FlexibleEntityBundle\Entity\Repository\FlexibleEntityRepository')
- ->disableOriginalConstructor()
- ->getMock();
-
- $repo->expects($this->once())
- ->method('findByWithAttributesQB')
- ->with(array(), null, array('id' => 'ASC'), $limit, $offset)
- ->will($this->returnValue($paginator));
-
- $this->fm->expects($this->once())
- ->method('getFlexibleRepository')
- ->will($this->returnValue($repo));
-
-
- $this->assertSame($paginator, $this->addressManager->getListQuery($limit, $offset));
- }
-
/**
* Return repository mock
*
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/AddressCollectionTypeSubscriberTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/AddressCollectionTypeSubscriberTest.php
deleted file mode 100644
index 517edb9c7b0..00000000000
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/AddressCollectionTypeSubscriberTest.php
+++ /dev/null
@@ -1,215 +0,0 @@
-typedAddressClass = $this->getMockClass('Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress');
- $this->subscriber = new AddressCollectionTypeSubscriber('test', $this->typedAddressClass);
- }
-
- public function testGetSubscribedEvents()
- {
- $result = $this->subscriber->getSubscribedEvents();
-
- $this->assertInternalType('array', $result);
- $this->assertArrayHasKey(FormEvents::PRE_SET_DATA, $result);
- $this->assertArrayHasKey(FormEvents::PRE_BIND, $result);
- $this->assertArrayHasKey(FormEvents::POST_BIND, $result);
- }
-
- public function testPreSetNotEmpty()
- {
- $addresses = $this->getMockBuilder('Doctrine\Common\Collections\Collection')
- ->disableOriginalConstructor()
- ->getMock();
- $addresses->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue(false));
- $addresses->expects($this->never())
- ->method('add');
- $this->subscriber->preSet($this->getEvent($addresses));
- }
-
- public function testPreSetEmpty()
- {
- $addresses = $this->getMockBuilder('Doctrine\Common\Collections\Collection')
- ->disableOriginalConstructor()
- ->getMock();
- $addresses->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue(true));
-
- $this->subscriber->preSet(
- $this->getEvent(
- $addresses,
- array($this->getMock('Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress'))
- )
- );
- }
-
- public function testPostBind()
- {
- $addressEmpty = $this->getMock('Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress');
- $addressEmpty->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue(true));
- $addressNotEmpty = $this->getMock('Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress');
- $addressNotEmpty->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue(false));
-
- $addresses = new \Doctrine\Common\Collections\ArrayCollection(array($addressEmpty, $addressNotEmpty));
- $this->subscriber->postBind(
- $this->getEvent(
- $addresses,
- new \Doctrine\Common\Collections\ArrayCollection(array(1 => $addressNotEmpty))
- )
- );
- }
-
- protected function getEvent($expectedGetDataValue, $expectedSetDataValue = null)
- {
- $data = $this->getMockBuilder('\stdClass')
- ->setMethods(array('getTest', 'setTest'))
- ->getMock();
-
- $data->expects($this->once())
- ->method('getTest')
- ->will($this->returnValue($expectedGetDataValue));
-
- if (null !== $expectedSetDataValue) {
- $data->expects($this->once())
- ->method('setTest')
- ->with($expectedSetDataValue);
- }
-
- $event = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
- ->disableOriginalConstructor()
- ->getMock();
- $event->expects($this->once())
- ->method('getData')
- ->will($this->returnValue($data));
-
- return $event;
- }
-
- /**
- * @dataProvider noDataPreBindDataProvider
- * @param array|null $data
- */
- public function testPreBindNoData($data)
- {
- $event = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
- ->disableOriginalConstructor()
- ->getMock();
- $event->expects($this->once())
- ->method('getData')
- ->will($this->returnValue($data));
- $event->expects($this->never())
- ->method('setData');
- $this->subscriber->preBind($event);
- }
-
- /**
- * @return array
- */
- public function noDataPreBindDataProvider()
- {
- return array(
- array(
- null, array()
- ),
- array(
- array(), array()
- )
- );
- }
-
- /**
- * @dataProvider preBindDataProvider
- * @param array|null $data
- * @param array $expected
- */
- public function testPreBind($data, $expected)
- {
- $event = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
- ->disableOriginalConstructor()
- ->getMock();
- $event->expects($this->once())
- ->method('getData')
- ->will($this->returnValue($data));
- $event->expects($this->once())
- ->method('setData')
- ->with($expected);
- $this->subscriber->preBind($event);
- }
-
- public function preBindDataProvider()
- {
- return array(
- array(
- array('key' => 'value', 'test' => array(array(), array('k' => 'v'))),
- array('key' => 'value', 'test' => array(array('k' => 'v', 'primary' => true)))
- ),
- array(
- array('key' => 'value', 'test' => array(array(array()), array('k' => 'v'))),
- array('key' => 'value', 'test' => array(array('k' => 'v', 'primary' => true)))
- ),
- array(
- array('key' => 'value', 'test' => array(array(array('k2' => 'v')), array('k' => 'v'))),
- array('key' => 'value', 'test' => array(array(array('k2' => 'v'), 'primary' => true), array('k' => 'v')))
- ),
- );
- }
-
- /**
- * @dataProvider preBindNoResetDataProvider
- * @param array $data
- */
- public function testPreBindNoReset($data)
- {
- $event = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
- ->disableOriginalConstructor()
- ->getMock();
- $event->expects($this->once())
- ->method('getData')
- ->will($this->returnValue($data));
- $event->expects($this->never())
- ->method('setData');
- $this->subscriber->preBind($event);
- }
-
- /**
- * @return array
- */
- public function preBindNoResetDataProvider()
- {
- return array(
- array(
- array('key' => 'value')
- ),
- array(
- array('key' => 'value', 'test' => array())
- )
- );
- }
-}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/BuildAddressFormListenerTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/AddressCountryAndRegionSubscriberTest.php
similarity index 91%
rename from src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/BuildAddressFormListenerTest.php
rename to src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/AddressCountryAndRegionSubscriberTest.php
index 861e69c1425..a31bdcf963b 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/BuildAddressFormListenerTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/AddressCountryAndRegionSubscriberTest.php
@@ -2,10 +2,10 @@
namespace Oro\Bundle\AddressBundle\Tests\Unit\EventListener;
-use Oro\Bundle\AddressBundle\Form\EventListener\BuildAddressFormListener;
+use Oro\Bundle\AddressBundle\Form\EventListener\AddressCountryAndRegionSubscriber;
use Symfony\Component\Form\FormEvents;
-class BuildAddressFormListenerTest extends \PHPUnit_Framework_TestCase
+class AddressCountryAndRegionSubscriberTest extends \PHPUnit_Framework_TestCase
{
/** @var \Doctrine\Common\Persistence\ObjectManager */
protected $om;
@@ -14,9 +14,9 @@ class BuildAddressFormListenerTest extends \PHPUnit_Framework_TestCase
protected $formBuilder;
/**
- * @var BuildAddressFormListener
+ * @var AddressCountryAndRegionSubscriber
*/
- protected $listener;
+ protected $subscriber;
/**
* SetUp test environment
@@ -26,12 +26,12 @@ public function setUp()
$this->om = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
$this->formBuilder = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
- $this->listener = new BuildAddressFormListener($this->om, $this->formBuilder);
+ $this->subscriber = new AddressCountryAndRegionSubscriber($this->om, $this->formBuilder);
}
public function testGetSubscribedEvents()
{
- $result = $this->listener->getSubscribedEvents();
+ $result = $this->subscriber->getSubscribedEvents();
$this->assertInternalType('array', $result);
$this->assertArrayHasKey(FormEvents::PRE_SET_DATA, $result);
@@ -50,7 +50,7 @@ public function testPreSetDataEmptyAddress()
$eventMock->expects($this->once())
->method('getForm');
- $this->assertEquals(null, $this->listener->preSetData($eventMock));
+ $this->assertEquals(null, $this->subscriber->preSetData($eventMock));
}
public function testPreSetDataEmptyCountry()
@@ -70,7 +70,7 @@ public function testPreSetDataEmptyCountry()
$eventMock->expects($this->once())
->method('getForm');
- $this->assertEquals(null, $this->listener->preSetData($eventMock));
+ $this->assertEquals(null, $this->subscriber->preSetData($eventMock));
}
public function testPreSetDataHasState()
@@ -133,7 +133,7 @@ public function testPreSetDataHasState()
->method('getForm')
->will($this->returnValue($formMock));
- $this->assertNull($this->listener->preSetData($eventMock));
+ $this->assertNull($this->subscriber->preSetData($eventMock));
}
public function testPreSetDataNoState()
@@ -181,10 +181,10 @@ public function testPreSetDataNoState()
->method('getForm')
->will($this->returnValue($formMock));
- $this->assertNull($this->listener->preSetData($eventMock));
+ $this->assertNull($this->subscriber->preSetData($eventMock));
}
- public function testPreBindData()
+ public function testPreSubmitData()
{
$eventMock = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
->disableOriginalConstructor()
@@ -243,6 +243,6 @@ public function testPreBindData()
->method('getForm')
->will($this->returnValue($formMock));
- $this->assertEquals(null, $this->listener->preBind($eventMock));
+ $this->assertEquals(null, $this->subscriber->preSubmit($eventMock));
}
}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/FixAddressesPrimaryAndTypesSubscriberTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/FixAddressesPrimaryAndTypesSubscriberTest.php
new file mode 100644
index 00000000000..90535b0251f
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/FixAddressesPrimaryAndTypesSubscriberTest.php
@@ -0,0 +1,33 @@
+subscriber = new FixAddressesPrimaryAndTypesSubscriber('owner.address');
+ }
+
+
+ public function testGetSubscribedEvents()
+ {
+ $this->assertEquals(
+ array(FormEvents::POST_SUBMIT => 'postSubmit'),
+ $this->subscriber->getSubscribedEvents()
+ );
+ }
+
+ public function testPostSubmit()
+ {
+ $this->markTestIncomplete('Implement tests for primary and types');
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php
new file mode 100644
index 00000000000..88c5a984781
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/EventListener/ItemCollectionTypeSubscriberTest.php
@@ -0,0 +1,211 @@
+typedAddressClass = $this->getMockClass('Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress');
+ $this->subscriber = new ItemCollectionTypeSubscriber();
+ }
+
+ public function testGetSubscribedEvents()
+ {
+ $result = $this->subscriber->getSubscribedEvents();
+
+ $this->assertInternalType('array', $result);
+ $this->assertArrayHasKey(FormEvents::POST_SUBMIT, $result);
+ $this->assertArrayHasKey(FormEvents::PRE_SUBMIT, $result);
+ }
+
+ public function testPostSubmit()
+ {
+ $itemEmpty = $this->getMock('Oro\Bundle\AddressBundle\Entity\EmptyItem');
+ $itemEmpty->expects($this->once())
+ ->method('isEmpty')
+ ->will($this->returnValue(true));
+ $itemNotEmpty = $this->getMock('Oro\Bundle\AddressBundle\Entity\EmptyItem');
+ $itemNotEmpty->expects($this->once())
+ ->method('isEmpty')
+ ->will($this->returnValue(false));
+ $itemNotEmptyType = $this->getMock('SomeClass');
+ $itemNotEmptyType->expects($this->never())->method($this->anything());
+
+ $data = new ArrayCollection(array($itemEmpty, $itemNotEmpty, $itemNotEmptyType));
+ $this->subscriber->postSubmit($this->createEvent($data));
+
+ $this->assertEquals(
+ array(
+ 1 => $itemNotEmpty,
+ 2 => $itemNotEmptyType
+ ),
+ $data->toArray()
+ );
+ }
+
+ public function testPostSubmitNotCollectionData()
+ {
+ $data = $this->getMock('SomeClass');
+ $data->expects($this->never())->method($this->anything());
+
+ $this->subscriber->postSubmit($this->createEvent($data));
+ }
+
+ /**
+ * @dataProvider preSubmitNoDataDataProvider
+ * @param array|null $data
+ */
+ public function testPreSubmitNoData($data)
+ {
+ $event = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $event->expects($this->once())
+ ->method('getData')
+ ->will($this->returnValue($data));
+ $event->expects($this->never())
+ ->method('setData');
+
+ $this->subscriber->preSubmit($event);
+ }
+
+ /**
+ * @return array
+ */
+ public function preSubmitNoDataDataProvider()
+ {
+ return array(
+ array(
+ null, array()
+ ),
+ array(
+ array(), array()
+ )
+ );
+ }
+
+ /**
+ * @dataProvider preSubmitDataProvider
+ *
+ * @param array $data
+ * @param array $expected
+ * @param bool $checkIsNew
+ * @param mixed $parentDataId
+ */
+ public function testPreSubmit(array $data, array $expected, $checkIsNew = false, $parentDataId = null)
+ {
+ $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ if ($checkIsNew) {
+ $parentForm = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $parentFormData = $this->getMock('SomeClass', array('getId'));
+
+ $form->expects($this->once())->method('getParent')
+ ->will($this->returnValue($parentForm));
+
+ $parentForm->expects($this->once())->method('getData')
+ ->will($this->returnValue($parentFormData));
+
+ $parentFormData->expects($this->once())->method('getId')
+ ->will($this->returnValue($parentDataId));
+ } else {
+ $form->expects($this->never())->method($this->anything());
+ }
+
+ $event = $this->createEvent($data, $form);
+ $this->subscriber->preSubmit($event);
+ $this->assertEquals($expected, $event->getData());
+ }
+
+ public function preSubmitDataProvider()
+ {
+ return array(
+ 'set_primary_for_new_data' => array(
+ 'data' => array(array('k' => 'v')),
+ 'expected' => array(array('k' => 'v', 'primary' => true)),
+ 'check_is_new' => true,
+ 'parent_data_id' => null
+ ),
+ 'set_primary_for_one_item' => array(
+ 'data' => array(array('k' => 'v')),
+ 'expected' => array(array('k' => 'v', 'primary' => true)),
+ 'check_is_new' => true,
+ 'parent_data_id' => 1
+ ),
+ 'not_set_primary_for_not_new_data' => array(
+ 'data' => array(array('k' => 'v'), array('k2' => 'v2')),
+ 'expected' => array(array('k' => 'v'), array('k2' => 'v2')),
+ 'check_is_new' => true,
+ 'parent_data_id' => 1
+ ),
+ 'primary_is_already_set' => array(
+ 'data' => array(array('primary' => true), array(array('k' => 'v'))),
+ 'expected' => array(array('primary' => true), array(array('k' => 'v')))
+ ),
+ 'skip_empty_data_array' => array(
+ 'data' => array(array(array()), array(), array('k' => 'v', 'primary' => true), array()),
+ 'expected' => array('2' => array('k' => 'v', 'primary' => true))
+ )
+ );
+ }
+
+ /**
+ * @dataProvider preSubmitNoResetDataProvider
+ * @param array $data
+ */
+ public function testPreSubmitNoReset($data)
+ {
+ $event = $this->getMockBuilder('Symfony\Component\Form\FormEvent')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $event->expects($this->once())
+ ->method('getData')
+ ->will($this->returnValue($data));
+ $event->expects($this->never())
+ ->method('setData');
+ $this->subscriber->preSubmit($event);
+ }
+
+ /**
+ * @return array
+ */
+ public function preSubmitNoResetDataProvider()
+ {
+ return array(
+ array(array()),
+ array('foo')
+ );
+ }
+
+ /**
+ * @param mixed $data
+ * @param FormInterface|null $form
+ * @return FormEvent
+ */
+ protected function createEvent($data, FormInterface $form = null)
+ {
+ $form = $form ? $form : $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ return new FormEvent($form, $data);
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AbstractAddressTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AbstractAddressTypeTest.php
deleted file mode 100644
index 49c248cf30c..00000000000
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AbstractAddressTypeTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-getMockBuilder('Oro\Bundle\AddressBundle\Form\EventListener\BuildAddressFormListener')
- ->disableOriginalConstructor()
- ->getMock();
- $flexibleManager = $this->getMockBuilder('Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->type = $this->createTestAddress($flexibleManager, 'oro_address_value', $buildAddressFormListener);
- }
-
- protected function createTestAddress(
- FlexibleManager $flexibleManager,
- $valueFormAlias,
- BuildAddressFormListener $eventListener
- ) {
- return $this->getMockForAbstractClass(
- 'Oro\Bundle\AddressBundle\Form\Type\AbstractAddressType',
- array($flexibleManager, $valueFormAlias, $eventListener)
- );
- }
-
- public function testAddEntityFields()
- {
- $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
- ->disableOriginalConstructor()
- ->getMock();
-
- $builder->expects($this->exactly(11))
- ->method('add')
- ->will($this->returnSelf());
-
- $builder->expects($this->at(0))
- ->method('add')
- ->with('id', 'hidden');
-
- $builder->expects($this->at(1))
- ->method('addEventSubscriber')
- ->with($this->isInstanceOf('Symfony\Component\EventDispatcher\EventSubscriberInterface'));
-
- $builder->expects($this->at(2))
- ->method('add')
- ->with('label', 'text');
-
- $builder->expects($this->at(3))
- ->method('add')
- ->with('firstName', 'text');
-
- $builder->expects($this->at(4))
- ->method('add')
- ->with('lastName', 'text');
-
- $builder->expects($this->at(5))
- ->method('add')
- ->with('street', 'text');
-
- $builder->expects($this->at(6))
- ->method('add')
- ->with('street2', 'text');
-
- $builder->expects($this->at(7))
- ->method('add')
- ->with('city', 'text');
-
- $builder->expects($this->at(8))
- ->method('add')
- ->with('state', 'oro_region');
-
- $builder->expects($this->at(9))
- ->method('add')
- ->with('state_text', 'hidden');
-
- $builder->expects($this->at(10))
- ->method('add')
- ->with('country', 'oro_country');
-
- $builder->expects($this->at(11))
- ->method('add')
- ->with('postalCode', 'text');
-
- $builder->expects($this->once())
- ->method('addEventSubscriber')
- ->with($this->isInstanceOf('Symfony\Component\EventDispatcher\EventSubscriberInterface'));
-
- $this->type->addEntityFields($builder);
- }
-
- public function testSetDefaultOptions()
- {
- $resolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
- $resolver->expects($this->once())
- ->method('setDefaults')
- ->with($this->isType('array'));
-
- $this->type->setDefaultOptions($resolver);
- }
-
- public function testGetName()
- {
- $this->setExpectedException(
- 'BadMethodCallException',
- sprintf('Method %s::getName() must be overridden.', get_class($this->type))
- );
- $this->type->getName();
- }
-}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AbstractTypedAddressTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AbstractTypedAddressTypeTest.php
deleted file mode 100644
index d99b7bba924..00000000000
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AbstractTypedAddressTypeTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-getMockBuilder('Oro\Bundle\AddressBundle\Form\EventListener\BuildAddressFormListener')
- ->disableOriginalConstructor()
- ->getMock();
- $flexibleManager = $this->getMockBuilder('Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->type = $this->getMockForAbstractClass(
- 'Oro\Bundle\AddressBundle\Form\Type\AbstractTypedAddressType',
- array(
- $flexibleManager,
- 'oro_address_value',
- $buildAddressFormListener
- )
- );
- }
-
- public function testAddEntityFields()
- {
- $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
- ->disableOriginalConstructor()
- ->getMock();
- $builder->expects($this->any())
- ->method('add')
- ->will($this->returnSelf());
- $builder->expects($this->at(0))
- ->method('add')
- ->with(
- 'types',
- 'translatable_entity',
- $this->callback(
- function ($options) {
- \PHPUnit_Framework_TestCase::assertArrayHasKey('class', $options);
- \PHPUnit_Framework_TestCase::assertArrayHasKey('property', $options);
- \PHPUnit_Framework_TestCase::assertEquals('OroAddressBundle:AddressType', $options['class']);
- \PHPUnit_Framework_TestCase::assertEquals('label', $options['property']);
- return true;
- }
- )
- );
-
- $builder->expects($this->at(1))
- ->method('add')
- ->with(
- 'primary',
- 'checkbox',
- $this->isType('array')
- );
-
- $this->type->addEntityFields($builder);
- }
-}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php
index 7d269a05399..ba8bccaec07 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressApiTypeTest.php
@@ -20,45 +20,32 @@ class AddressApiTypeTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
- $buildAddressFormListener = $this->getMockBuilder('Oro\Bundle\AddressBundle\Form\EventListener\BuildAddressFormListener')
- ->disableOriginalConstructor()
- ->getMock();
- $flexibleManager = $this->getMockBuilder('Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->type = new AddressApiType(
- $flexibleManager,
- 'oro_address_value',
- $buildAddressFormListener
- );
+ $this->type = new AddressApiType();
}
- public function testAddEntityFields()
+ public function testBuildForm()
{
- /** @var \Symfony\Component\Form\FormBuilderInterface $builder */
$builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
->disableOriginalConstructor()
->getMock();
- $builder->expects($this->exactly(11))
- ->method('add')
- ->will($this->returnSelf());
-
- $builder->expects($this->exactly(2))
+ $builder->expects($this->once())
->method('addEventSubscriber')
->with($this->isInstanceOf('Symfony\Component\EventDispatcher\EventSubscriberInterface'));
- $this->type->addEntityFields($builder);
+ $this->type->buildForm($builder, array());
}
public function testSetDefaultOptions()
{
- /** @var OptionsResolverInterface $resolver */
$resolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
$resolver->expects($this->once())
->method('setDefaults')
- ->with($this->isType('array'));
+ ->with(
+ array(
+ 'csrf_protection' => false,
+ )
+ );
$this->type->setDefaultOptions($resolver);
}
@@ -66,4 +53,9 @@ public function testGetName()
{
$this->assertEquals('address', $this->type->getName());
}
+
+ public function testGetParent()
+ {
+ $this->assertEquals('oro_address', $this->type->getParent());
+ }
}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressCollectionTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressCollectionTypeTest.php
index 9c527548c29..08cb573e3d1 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressCollectionTypeTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressCollectionTypeTest.php
@@ -1,8 +1,6 @@
type = new AddressCollectionType();
}
- public function testSetDefaultOptions()
- {
- /** @var OptionsResolverInterface $resolver */
- $resolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
- $resolver->expects($this->once())
- ->method('setDefaults')
- ->with($this->isType('array'));
- $this->type->setDefaultOptions($resolver);
- }
-
public function testGetParent()
{
- $this->assertEquals('collection', $this->type->getParent());
+ $this->assertEquals('oro_item_collection', $this->type->getParent());
}
public function testGetName()
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressTypeTest.php
index 2c02a7cceb5..d744a5292c6 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressTypeTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/AddressTypeTest.php
@@ -2,22 +2,96 @@
namespace Oro\Bundle\AddressBundle\Tests\Unit\Form\Type;
use Oro\Bundle\AddressBundle\Form\Type\AddressType;
-use Oro\Bundle\FlexibleEntityBundle\Manager\FlexibleManager;
-use Oro\Bundle\AddressBundle\Form\EventListener\BuildAddressFormListener;
-class AddressTypeTest extends AbstractAddressTypeTest
+class AddressTypeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var AbstractAddressTypeTest
+ * @var AddressType
*/
protected $type;
- protected function createTestAddress(
- FlexibleManager $flexibleManager,
- $valueFormAlias,
- BuildAddressFormListener $eventListener
- ) {
- return new AddressType($flexibleManager, $valueFormAlias, $eventListener);
+ /**
+ * Setup test env
+ */
+ public function setUp()
+ {
+ $buildAddressFormListener = $this->getMockBuilder(
+ 'Oro\Bundle\AddressBundle\Form\EventListener\AddressCountryAndRegionSubscriber'
+ )->disableOriginalConstructor()->getMock();
+
+ $this->type = new AddressType($buildAddressFormListener);
+ }
+
+ public function testBuildForm()
+ {
+ $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $builder->expects($this->exactly(11))
+ ->method('add')
+ ->will($this->returnSelf());
+
+ $builder->expects($this->at(0))
+ ->method('addEventSubscriber')
+ ->with($this->isInstanceOf('Symfony\Component\EventDispatcher\EventSubscriberInterface'))
+ ->will($this->returnSelf());
+
+ $builder->expects($this->at(1))
+ ->method('add')
+ ->with('id', 'hidden');
+
+ $builder->expects($this->at(2))
+ ->method('add')
+ ->with('label', 'text');
+
+ $builder->expects($this->at(3))
+ ->method('add')
+ ->with('firstName', 'text');
+
+ $builder->expects($this->at(4))
+ ->method('add')
+ ->with('lastName', 'text');
+
+ $builder->expects($this->at(5))
+ ->method('add')
+ ->with('street', 'text');
+
+ $builder->expects($this->at(6))
+ ->method('add')
+ ->with('street2', 'text');
+
+ $builder->expects($this->at(7))
+ ->method('add')
+ ->with('city', 'text');
+
+ $builder->expects($this->at(8))
+ ->method('add')
+ ->with('state', 'oro_region');
+
+ $builder->expects($this->at(9))
+ ->method('add')
+ ->with('state_text', 'hidden');
+
+ $builder->expects($this->at(10))
+ ->method('add')
+ ->with('country', 'oro_country');
+
+ $builder->expects($this->at(11))
+ ->method('add')
+ ->with('postalCode', 'text');
+
+ $this->type->buildForm($builder, array());
+ }
+
+ public function testSetDefaultOptions()
+ {
+ $resolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
+ $resolver->expects($this->once())
+ ->method('setDefaults')
+ ->with($this->isType('array'));
+
+ $this->type->setDefaultOptions($resolver);
}
public function testGetName()
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/EmailCollectionTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/EmailCollectionTypeTest.php
new file mode 100644
index 00000000000..132006651a8
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/EmailCollectionTypeTest.php
@@ -0,0 +1,30 @@
+type = new EmailCollectionType();
+ }
+
+ public function testGetParent()
+ {
+ $this->assertEquals('oro_item_collection', $this->type->getParent());
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals('oro_email_collection', $this->type->getName());
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/EmailTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/EmailTypeTest.php
new file mode 100644
index 00000000000..965b67997ae
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/EmailTypeTest.php
@@ -0,0 +1,47 @@
+type = new EmailType();
+ }
+
+ public function testBuildForm()
+ {
+ $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $builder->expects($this->exactly(3))
+ ->method('add')
+ ->will($this->returnSelf());
+
+ $builder->expects($this->at(0))
+ ->method('add')
+ ->with('id', 'hidden');
+
+ $builder->expects($this->at(1))
+ ->method('add')
+ ->with('email', 'email');
+
+ $builder->expects($this->at(2))
+ ->method('add')
+ ->with('primary', 'radio');
+
+ $this->type->buildForm($builder, array());
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals('oro_email', $this->type->getName());
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/ItemCollectionTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/ItemCollectionTypeTest.php
new file mode 100644
index 00000000000..d8c41208386
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/ItemCollectionTypeTest.php
@@ -0,0 +1,66 @@
+type = new ItemCollectionType();
+ }
+
+ public function testBuildForm()
+ {
+ $builder = $this->getMock('Symfony\Component\Form\Test\FormBuilderInterface');
+
+ $builder->expects($this->once())
+ ->method('addEventSubscriber')
+ ->with($this->isInstanceOf('Oro\Bundle\AddressBundle\Form\EventListener\ItemCollectionTypeSubscriber'));
+
+ $options = array();
+ $this->type->buildForm($builder, $options);
+ }
+
+ public function testBuildView()
+ {
+ $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $view = new FormView();
+
+ $options = array(
+ 'show_form_when_empty' => true
+ );
+ $this->type->buildView($view, $form, $options);
+
+ $this->assertArrayHasKey('show_form_when_empty', $view->vars);
+ $this->assertEquals($options['show_form_when_empty'], $view->vars['show_form_when_empty']);
+ }
+
+ public function testSetDefaultOptions()
+ {
+ $resolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
+ $resolver->expects($this->once())
+ ->method('setDefaults')
+ ->with($this->isType('array'));
+ $this->type->setDefaultOptions($resolver);
+ }
+
+ public function testGetParent()
+ {
+ $this->assertEquals('collection', $this->type->getParent());
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals('oro_item_collection', $this->type->getName());
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/PhoneCollectionTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/PhoneCollectionTypeTest.php
new file mode 100644
index 00000000000..eb2f0d19a0c
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/PhoneCollectionTypeTest.php
@@ -0,0 +1,30 @@
+type = new PhoneCollectionType();
+ }
+
+ public function testGetParent()
+ {
+ $this->assertEquals('oro_item_collection', $this->type->getParent());
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals('oro_phone_collection', $this->type->getName());
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/PhoneTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/PhoneTypeTest.php
new file mode 100644
index 00000000000..42e95fe1fd8
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/PhoneTypeTest.php
@@ -0,0 +1,50 @@
+type = new PhoneType();
+ }
+
+ public function testBuildForm()
+ {
+ $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $builder->expects($this->exactly(3))
+ ->method('add')
+ ->will($this->returnSelf());
+
+ $builder->expects($this->at(0))
+ ->method('add')
+ ->with('id', 'hidden');
+
+ $builder->expects($this->at(1))
+ ->method('add')
+ ->with('phone', 'text');
+
+ $builder->expects($this->at(2))
+ ->method('add')
+ ->with('primary', 'radio');
+
+ $this->type->buildForm($builder, array());
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals('oro_phone', $this->type->getName());
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/TypedAddressTypeTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/TypedAddressTypeTest.php
new file mode 100644
index 00000000000..e5b072150a7
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Form/Type/TypedAddressTypeTest.php
@@ -0,0 +1,113 @@
+type = new TypedAddressType();
+ }
+
+ /**
+ * @dataProvider buildFormDataProvider
+ *
+ * @param array $options
+ * @param bool $expectAddSubscriber
+ */
+ public function testBuildForm(array $options, $expectAddSubscriber)
+ {
+ $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $at = 0;
+
+ if ($expectAddSubscriber) {
+ $builder->expects($this->at($at++))
+ ->method('addEventSubscriber')
+ ->with(
+ $this->isInstanceOf(
+ 'Oro\Bundle\AddressBundle\Form\EventListener\FixAddressesPrimaryAndTypesSubscriber'
+ )
+ )
+ ->will($this->returnSelf());
+ }
+
+ $builder->expects($this->at($at++))
+ ->method('add')
+ ->with(
+ 'types',
+ 'translatable_entity',
+ array(
+ 'class' => 'OroAddressBundle:AddressType',
+ 'property' => 'label',
+ 'required' => false,
+ 'multiple' => true,
+ 'expanded' => true,
+ )
+ )
+ ->will($this->returnSelf());
+
+ $builder->expects($this->at($at++))
+ ->method('add')
+ ->with(
+ 'primary',
+ 'checkbox',
+ array(
+ 'label' => 'Primary',
+ 'required' => false
+ )
+ )
+ ->will($this->returnSelf());
+
+ $this->type->buildForm($builder, $options);
+ }
+
+ public function buildFormDataProvider()
+ {
+ return array(
+ array(
+ 'options' => array(
+ 'single_form' => false,
+ 'all_addresses_property_path' => null,
+ ),
+ 'expectAddSubscriber' => false
+ ),
+ array(
+ 'options' => array(
+ 'single_form' => true,
+ 'all_addresses_property_path' => null,
+ ),
+ 'expectAddSubscriber' => false
+ ),
+ array(
+ 'options' => array(
+ 'single_form' => true,
+ 'all_addresses_property_path' => 'owner.addresses',
+ ),
+ 'expectAddSubscriber' => true
+ )
+ );
+ }
+
+ public function testGetParent()
+ {
+ $this->assertEquals('oro_address', $this->type->getParent());
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals('oro_typed_address', $this->type->getName());
+ }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Twig/HasAddressExtensionTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Twig/HasAddressExtensionTest.php
deleted file mode 100644
index b30a6db8d04..00000000000
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Twig/HasAddressExtensionTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-extension = new HasAddressExtension();
- $this->entityMock = $this->getMock('Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexible');
- $this->valuesMock = $this->getMock('Doctrine\Common\Collections\ArrayCollection');
- $this->valueMock = $this->getMock('Oro\Bundle\FlexibleEntityBundle\Model\FlexibleValueInterface');
- }
-
- public function testGetName()
- {
- $this->assertEquals('oro_address_hasAddress', $this->extension->getName());
- }
-
- public function testGetFilters()
- {
- $filters = $this->extension->getFilters();
-
- $this->assertArrayHasKey('hasAddress', $filters);
- $this->assertInstanceOf('\Twig_Filter_Method', $filters['hasAddress']);
- }
-
- public function testHasAddressPositiveScenario()
- {
- $this->valueMock->expects($this->once())
- ->method('getData')
- ->will($this->returnValue(true));
-
- $this->entityMock->expects($this->once())
- ->method('getValue')
- ->with($this->equalTo('address'))
- ->will($this->returnValue($this->valueMock));
-
- $this->assertTrue($this->extension->hasAddress($this->entityMock, 'address'));
- }
-
- public function testHasAddressNegativeScenario()
- {
- $this->valueMock->expects($this->once())
- ->method('getData')
- ->will($this->returnValue(null));
-
- $this->entityMock->expects($this->once())
- ->method('getValue')
- ->with($this->equalTo('address'))
- ->will($this->returnValue($this->valueMock));
-
- $this->assertFalse($this->extension->hasAddress($this->entityMock, 'address'));
- }
-
- public function testHasAddressPositiveScenarioWithoutCode()
- {
- $this->entityMock->expects($this->once())
- ->method('getValues')
- ->will($this->returnValue($this->valuesMock));
-
- $this->valuesMock->expects($this->once())
- ->method('filter')
- ->will($this->returnValue($this->valuesMock));
- $this->valuesMock->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue(false));
-
- $this->assertTrue($this->extension->hasAddress($this->entityMock));
- }
-
- public function testHasAddressNegativeScenarioWithoutCode()
- {
- $this->entityMock->expects($this->once())
- ->method('getValues')
- ->will($this->returnValue($this->valuesMock));
-
- $this->valuesMock->expects($this->once())
- ->method('filter')
- ->will($this->returnValue($this->valuesMock));
- $this->valuesMock->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue(true));
-
- $this->assertFalse($this->extension->hasAddress($this->entityMock));
- }
-}
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ContainsPrimaryValidatorTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ContainsPrimaryValidatorTest.php
index a186e03121b..ce475989003 100644
--- a/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ContainsPrimaryValidatorTest.php
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ContainsPrimaryValidatorTest.php
@@ -18,10 +18,10 @@ public function testValidateException()
}
/**
- * @dataProvider validAddressesDataProvider
- * @param array $addresses
+ * @dataProvider validItemsDataProvider
+ * @param array $items
*/
- public function testValidateValid(array $addresses)
+ public function testValidateValid(array $items)
{
$context = $this->getMockBuilder('Symfony\Component\Validator\ExecutionContext')
->disableOriginalConstructor()
@@ -33,89 +33,84 @@ public function testValidateValid(array $addresses)
$validator = new ContainsPrimaryValidator();
$validator->initialize($context);
- $validator->validate($addresses, $constraint);
+ $validator->validate($items, $constraint);
}
/**
* @return array
*/
- public function validAddressesDataProvider()
+ public function validItemsDataProvider()
{
return array(
- 'no addresses' => array(
+ 'no items' => array(
array()
),
- 'one address primary' => array(
- array($this->getTypedAddressMock(true))
+ 'one item primary' => array(
+ array($this->getPrimaryItemMock(true))
),
- 'more than one address with primary' => array(
- array($this->getTypedAddressMock(false), $this->getTypedAddressMock(true))
+ 'more than one item with primary' => array(
+ array($this->getPrimaryItemMock(false), $this->getPrimaryItemMock(true))
),
- 'empty address' => array(
- array($this->getTypedAddressMock(false, true), $this->getTypedAddressMock(false, true))
- ),
- 'empty address and primary' => array(
- array($this->getTypedAddressMock(false, true), $this->getTypedAddressMock(true), $this->getTypedAddressMock(false, true))
+ 'empty item and primary' => array(
+ array($this->getPrimaryItemMock(false, true), $this->getPrimaryItemMock(true), $this->getPrimaryItemMock(false, true))
)
);
}
/**
- * @dataProvider invalidAddressesDataProvider
- * @param array $addresses
+ * @dataProvider invalidItemsDataProvider
+ * @param array $items
*/
- public function testValidateInvalid($addresses)
+ public function testValidateInvalid($items)
{
$context = $this->getMockBuilder('Symfony\Component\Validator\ExecutionContext')
->disableOriginalConstructor()
->getMock();
$context->expects($this->once())
->method('addViolation')
- ->with('One of addresses must be set as primary.');
+ ->with('One of items must be set as primary.');
$constraint = $this->getMock('Oro\Bundle\AddressBundle\Validator\Constraints\ContainsPrimary');
$validator = new ContainsPrimaryValidator();
$validator->initialize($context);
- $validator->validate($addresses, $constraint);
+ $validator->validate($items, $constraint);
}
/**
* @return array
*/
- public function invalidAddressesDataProvider()
+ public function invalidItemsDataProvider()
{
return array(
- 'one address' => array(
- array($this->getTypedAddressMock(false))
+ 'one item' => array(
+ array($this->getPrimaryItemMock(false))
),
- 'more than one address no primary' => array(
- array($this->getTypedAddressMock(false), $this->getTypedAddressMock(false))
+ 'more than one item no primary' => array(
+ array($this->getPrimaryItemMock(false), $this->getPrimaryItemMock(false))
),
- 'more than one address more than one primary' => array(
- array($this->getTypedAddressMock(true), $this->getTypedAddressMock(true))
+ 'more than one item more than one primary' => array(
+ array($this->getPrimaryItemMock(true), $this->getPrimaryItemMock(true))
),
);
}
/**
- * Get address mock.
+ * Get primary item mock.
*
* @param bool $isPrimary
- * @param bool $isEmpty
* @return \PHPUnit_Framework_MockObject_MockObject
*/
- protected function getTypedAddressMock($isPrimary, $isEmpty = false)
+ protected function getPrimaryItemMock($isPrimary)
{
- $address = $this->getMockBuilder('Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress')
+ $item = $this->getMockBuilder('Oro\Bundle\AddressBundle\Entity\PrimaryItem')
->disableOriginalConstructor()
->getMock();
- $address->expects($this->any())
+
+ $item->expects($this->any())
->method('isPrimary')
->will($this->returnValue($isPrimary));
- $address->expects($this->once())
- ->method('isEmpty')
- ->will($this->returnValue($isEmpty));
- return $address;
+
+ return $item;
}
}
diff --git a/src/Oro/Bundle/AddressBundle/Twig/HasAddressExtension.php b/src/Oro/Bundle/AddressBundle/Twig/HasAddressExtension.php
deleted file mode 100644
index bdb44400038..00000000000
--- a/src/Oro/Bundle/AddressBundle/Twig/HasAddressExtension.php
+++ /dev/null
@@ -1,55 +0,0 @@
- new \Twig_Filter_Method($this, 'hasAddress')
- );
- }
-
- /**
- * Check whenever flexible entity contains not empty address attribute
- *
- * @param \Oro\Bundle\FlexibleEntityBundle\Entity\Mapping\AbstractEntityFlexible $entity
- * @param null $addressCode
- * @return bool
- */
- public function hasAddress(AbstractEntityFlexible $entity, $addressCode = null)
- {
- if ($addressCode !== null) {
- $address = $entity->getValue($addressCode);
-
- return $address->getData() != null;
- }
-
- /** @var \Doctrine\Common\Collections\ArrayCollection $values **/
- $values = $entity->getValues();
- $values = $values->filter(
- function ($value) {
- if (strpos($value->getAttribute()->getCode(), 'address') !== false) {
- return $value->getData() != null;
- }
-
- return false;
- }
- );
- return !$values->isEmpty();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getName()
- {
- return 'oro_address_hasAddress';
- }
-}
diff --git a/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimary.php b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimary.php
index ac362a26674..28d18657db6 100644
--- a/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimary.php
+++ b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimary.php
@@ -6,5 +6,5 @@
class ContainsPrimary extends Constraint
{
- public $message = 'One of addresses must be set as primary.';
+ public $message = 'One of items must be set as primary.';
}
diff --git a/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimaryValidator.php b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimaryValidator.php
index 01beb7db9d1..e765e3a8f37 100644
--- a/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimaryValidator.php
+++ b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ContainsPrimaryValidator.php
@@ -2,11 +2,12 @@
namespace Oro\Bundle\AddressBundle\Validator\Constraints;
-use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Oro\Bundle\AddressBundle\Entity\PrimaryItem;
+
class ContainsPrimaryValidator extends ConstraintValidator
{
public function validate($value, Constraint $constraint)
@@ -17,14 +18,12 @@ public function validate($value, Constraint $constraint)
$primaryItemsNumber = 0;
$totalItemsNumber = 0;
- /** @var AbstractTypedAddress $item */
+ /** @var PrimaryItem $item */
foreach ($value as $item) {
- if (!$item->isEmpty()) {
- if ($item instanceof AbstractTypedAddress && $item->isPrimary()) {
- $primaryItemsNumber++;
- }
- $totalItemsNumber++;
+ if ($item instanceof PrimaryItem && $item->isPrimary()) {
+ $primaryItemsNumber++;
}
+ $totalItemsNumber++;
}
if ($totalItemsNumber > 0 && $primaryItemsNumber != 1) {
diff --git a/src/Oro/Bundle/AddressBundle/composer.json b/src/Oro/Bundle/AddressBundle/composer.json
index 02065ac4879..77fdf8a6dfd 100644
--- a/src/Oro/Bundle/AddressBundle/composer.json
+++ b/src/Oro/Bundle/AddressBundle/composer.json
@@ -13,7 +13,6 @@
"friendsofsymfony/rest-bundle": "0.11.*",
"friendsofsymfony/jsrouting-bundle": "1.1.*@dev",
"nelmio/api-doc-bundle": "dev-master",
- "oro/flexible-entity-bundle": "dev-master",
"oro/form-bundle": "dev-master",
"oro/translation-bundle": "dev-master",
"besimple/soap-bundle": "dev-master"
diff --git a/src/Oro/Bundle/AsseticBundle/Command/OroAsseticDumpCommand.php b/src/Oro/Bundle/AsseticBundle/Command/OroAsseticDumpCommand.php
index 5a71c4d8a3d..686ac7e1f65 100644
--- a/src/Oro/Bundle/AsseticBundle/Command/OroAsseticDumpCommand.php
+++ b/src/Oro/Bundle/AsseticBundle/Command/OroAsseticDumpCommand.php
@@ -3,14 +3,17 @@
namespace Oro\Bundle\AsseticBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Assetic\Asset\AssetInterface;
-use Assetic\Util\VarUtils;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\HttpFoundation\Request;
+use Doctrine\Common\Cache\CacheProvider;
+
+use Assetic\Asset\AssetInterface;
+use Assetic\Util\VarUtils;
+
use Oro\Bundle\AsseticBundle\Factory\OroAssetManager;
class OroAsseticDumpCommand extends ContainerAwareCommand
@@ -20,6 +23,11 @@ class OroAsseticDumpCommand extends ContainerAwareCommand
*/
protected $am;
+ /**
+ * @var CacheProvider
+ */
+ protected $cache;
+
protected function configure()
{
$this
@@ -31,8 +39,9 @@ protected function configure()
protected function initialize(InputInterface $input, OutputInterface $output)
{
- $this->basePath = $input->getArgument('write_to') ?: $this->getContainer()->getParameter('assetic.write_to');
+ $this->basePath = $input->getArgument('write_to') ? : $this->getContainer()->getParameter('assetic.write_to');
$this->am = $this->getContainer()->get('oro_assetic.asset_manager');
+ $this->cache = $this->getContainer()->get('oro_assetic.cache');
}
protected function execute(InputInterface $input, OutputInterface $output)
@@ -45,6 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$output->writeln(sprintf('Debug mode is
+ {% if form.children|length %}
+ {% for child in form.children %}
+ {{ _self.oro_collection_item_prototype(child) }}
+ {% endfor %}
+ {% elseif show_form_when_empty %}
+ {{ prototypeHtml|replace({'__name__': '0'})|raw }}
+ {% endif %}
{{ 'Add'|trans }}
+
+{% endblock page_container %}
+
+{% block content %}
+
+{{ knp_pagination_render(pager, 'OroUIBundle::pager.html.twig') }}
+
+{{ 'oro.cron.header.jobs'|trans }}
+
+
+
+ {{ block('sidebar') }}
+
+
+ {{ block('content') }}
+
+ | {{ 'oro.cron.header.id'|trans }} | +{{ 'oro.cron.header.command'|trans }} | +{{ 'oro.cron.header.state'|trans }} | +{{ 'oro.cron.header.created'|trans }} | +{{ 'oro.cron.header.runtime'|trans }} | +{{ 'oro.cron.header.memory'|trans }} | +
|---|---|---|---|---|---|
| {{ job.id }} | +{{ macros.command(job) }} | +{{ macros.state(job) }} | +{{ macros.ago(job.createdAt) }} | +{{ job.runtime|default('oro.cron.na'|trans) }} | +{{ (job.memoryUsageReal / 1048576)|number_format(2) }} | +
| {{ 'oro.cron.no_jobs'|trans }} | +|||||
+ {{ 'oro.cron.sidebar.status'|trans }}: + {{ pid ? 'oro.cron.sidebar.running'|trans : 'oro.cron.sidebar.not_running'|trans }} + +
+ }})
+{{ 'oro.cron.sidebar.pid'|trans }}: {{ pid|default('oro.cron.na'|trans) }}
+ ++ + +
+{{ 'oro.cron.sidebar.refresh'|trans }}
+ + +{% endblock -%} diff --git a/src/Oro/Bundle/CronBundle/Resources/views/Job/view.html.twig b/src/Oro/Bundle/CronBundle/Resources/views/Job/view.html.twig new file mode 100644 index 00000000000..92de07adc22 --- /dev/null +++ b/src/Oro/Bundle/CronBundle/Resources/views/Job/view.html.twig @@ -0,0 +1,176 @@ +{% extends 'OroUIBundle:actions:view.html.twig' %} +{% import 'JMSJobQueueBundle:Job:macros.html.twig' as macros %} +{% use 'OroCronBundle:Job:sidebar.html.twig' %} + +{% oro_title_set({ params: { '%command%': job.command, '%id%': job.id } }) %} + +{% block pageHeader %} + {% set breadcrumbs = { + entity: job, + indexPath: path('oro_cron_job_index'), + indexLabel: 'Jobs', + entityTitle: 'Job "' ~ job.command ~ '"' + } + %} + {{ parent() }} +{% endblock pageHeader %} + +{% block stats %}{% endblock stats %} + +{% block content_data %} +
+
+{% endblock %}
diff --git a/src/Oro/Bundle/CronBundle/Tests/Unit/DependencyInjection/OroCronExtensionTest.php b/src/Oro/Bundle/CronBundle/Tests/Unit/DependencyInjection/OroCronExtensionTest.php
new file mode 100644
index 00000000000..4737ec9a255
--- /dev/null
+++ b/src/Oro/Bundle/CronBundle/Tests/Unit/DependencyInjection/OroCronExtensionTest.php
@@ -0,0 +1,87 @@
+createEmptyConfiguration();
+
+ $this->assertParameter(5, 'oro_cron.max_jobs');
+ }
+
+ public function testLoad()
+ {
+ $this->createFullConfiguration();
+
+ $this->assertParameter(10, 'oro_cron.max_jobs');
+ }
+
+ protected function createEmptyConfiguration()
+ {
+ $this->configuration = new ContainerBuilder();
+
+ $loader = new OroCronExtension();
+ $config = $this->getEmptyConfig();
+
+ $loader->load(array($config), $this->configuration);
+
+ $this->assertTrue($this->configuration instanceof ContainerBuilder);
+ }
+
+ protected function createFullConfiguration()
+ {
+ $this->configuration = new ContainerBuilder();
+
+ $loader = new OroCronExtension();
+ $config = $this->getFullConfig();
+
+ $loader->load(array($config), $this->configuration);
+
+ $this->assertTrue($this->configuration instanceof ContainerBuilder);
+ }
+
+ /**
+ * @return array
+ */
+ protected function getEmptyConfig()
+ {
+ $yaml = '';
+ $parser = new Parser();
+
+ return $parser->parse($yaml);
+ }
+
+ protected function getFullConfig()
+ {
+ $yaml = <<
+
+
+ {{ block('sidebar') }}
+
+
+
+
+
+ {% if job.retryJobs|length > 0 %}
+
+
+
+ {% endif %}
+
+ {% if job.output is not empty %}
+
+ | {{ 'oro.cron.header.command'|trans }} | +{{ macros.command(job) }} | +
|---|---|
| {{ 'oro.cron.header.state'|trans }} | +{{ macros.state(job) }} | +
| {{ 'oro.cron.header.created'|trans }} | +{{ macros.ago(job.createdAt) }} | +
| {{ 'oro.cron.view.original'|trans }} | +#{{ job.originalJob.id }} {{ macros.state(job.originalJob) }} | +
| {{ 'oro.cron.view.related'|trans }} | ++ {%- for entity in relatedEntities %} + {%- if entity.raw is jms_job_queue_linkable -%} + {{ entity.raw|jms_job_queue_linkname }} + {%- else -%} + {{ entity.class }} ({{ entity.id }}) + {%- endif -%} + + {% if not loop.last %}, {% endif -%} + {% endfor -%} + | +
| {{ 'oro.cron.view.deps'|trans }} | ++ {%- for dep in job.dependencies -%} + {{ dep.command }} {{ macros.state(dep) }} + {%- if not loop.last %}, {% endif -%} + {%- endfor -%} + | +
| {{ 'oro.cron.view.in_deps'|trans }} | ++ {%- for dep in dependencies -%} + {{ dep.command }} {{ macros.state(dep) }} + {%- endfor -%} + | +
{{ 'oro.cron.header.retry'|trans }}
+ +| {{ 'oro.cron.header.id'|trans }} | +{{ 'oro.cron.header.created'|trans }} | +{{ 'oro.cron.header.state'|trans }} | +
|---|---|---|
| {{ retryJob.id }} | +{{ macros.ago(retryJob.createdAt) }} | +{{ macros.state(retryJob) }} | +
{{ 'oro.cron.header.output'|trans }}
+{{ job.output }}
+ {% endif %}
+
+ {% if job.errorOutput is not empty %}
+ {{ 'oro.cron.header.error'|trans }}
+{{ job.errorOutput }}
+ {% endif %}
+
+ {% if job.stackTrace is not empty %}
+ {{ 'oro.cron.header.trace'|trans }}
+ {% for position, ex in job.stackTrace.toarray %} +
+
+ {{ ex.class|abbr_class }}: {{ ex.message|nl2br|format_file_from_text }}
+ {% spaceless %}
+
+
+
+
+ {% endfor %}
+ {% endif %}
+
+ {% if statistics is not empty %}
+
+ {{ ex.class|abbr_class }}: {{ ex.message|nl2br|format_file_from_text }}
+ {% spaceless %}
+
+  }})
+  }})
+
+ {% endspaceless %}
+
+
+ {{ 'oro.cron.header.statistics'|trans }}
+ + + {% endif %} +
- {% block content %}
-
- {% endblock %}
-
-{% endblock %}
diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig b/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
new file mode 100644
index 00000000000..bf0bc88ce3f
--- /dev/null
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/views/Audit/widget/history.html.twig
@@ -0,0 +1,12 @@
+
diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/views/change_history_link.html.twig b/src/Oro/Bundle/DataAuditBundle/Resources/views/change_history_link.html.twig
index 5f27f7b5b34..2b2344bfffb 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/views/change_history_link.html.twig
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/views/change_history_link.html.twig
@@ -1,6 +1,3 @@
-
-
-
+Sample Email Body
\n some text \n some text \n some text \n some text \n some text"); + + $emailBody->addAttachment( + $this->createEmailAttachment( + 'sample attachment file.txt', + 'text/plain', + 'binary', + 'some text' + ) + ); + + $emailBody->addAttachment( + $this->createEmailAttachment( + 'sample attachment file (base64).txt', + 'text/plain', + 'base64', + 'some text' + ) + ); + + $email->setEmailBody($emailBody); + + $this->em->persist($email); + $this->em->flush(); + } + + /** + * Create CreateEmailAttachment object + * + * @param string $fileName + * @param string $contentType + * @param string $contentTransferEncoding + * @param string $content + * @return EmailAttachment + */ + protected function createEmailAttachment($fileName, $contentType, $contentTransferEncoding, $content) + { + $emailAttachmentContent = new EmailAttachmentContent(); + $emailAttachmentContent + ->setContentTransferEncoding($contentTransferEncoding) + ->setValue($content); + + $emailAttachment = new EmailAttachment(); + $emailAttachment + ->setFileName($fileName) + ->setContentType($contentType) + ->setContent($emailAttachmentContent); + + return $emailAttachment; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php new file mode 100644 index 00000000000..0738c809716 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheClearer.php @@ -0,0 +1,73 @@ +entityCacheDir = $entityCacheDir; + $this->entityCacheNamespace = $entityCacheNamespace; + $this->entityProxyNameTemplate = $entityProxyNameTemplate; + } + + /** + * {inheritdoc} + */ + public function clear($cacheDir) + { + $fs = $this->createFilesystem(); + + $entityCacheDir = sprintf('%s/%s', $this->entityCacheDir, str_replace('\\', '/', $this->entityCacheNamespace)); + + $this->clearEmailAddressCache($entityCacheDir, $fs); + } + + /** + * Create Filesystem object + * + * @return Filesystem + */ + protected function createFilesystem() + { + return new Filesystem(); + } + + /** + * Clear a proxy class for EmailAddress entity and save it in cache + * + * @param string $entityCacheDir + * @param Filesystem $fs + */ + protected function clearEmailAddressCache($entityCacheDir, Filesystem $fs) + { + $className = sprintf($this->entityProxyNameTemplate, 'EmailAddress'); + $fs->remove(sprintf('%s/%s.php', $entityCacheDir, $className)); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php new file mode 100644 index 00000000000..460f1baba73 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Cache/EntityCacheWarmer.php @@ -0,0 +1,137 @@ +getProviders() as $provider) { + $this->emailOwnerClasses[count($this->emailOwnerClasses) + 1] = $provider->getEmailOwnerClass(); + } + + $this->entityCacheDir = $entityCacheDir; + $this->entityCacheNamespace = $entityCacheNamespace; + $this->entityProxyNameTemplate = $entityProxyNameTemplate; + } + + /** + * {inheritdoc} + */ + public function warmUp($cacheDir) + { + $fs = $this->createFilesystem(); + $twig = $this->createTwigEnvironment(); + + $entityCacheDir = sprintf('%s/%s', $this->entityCacheDir, str_replace('\\', '/', $this->entityCacheNamespace)); + + // Ensure the cache directory exists + if (!$fs->exists($entityCacheDir)) { + $fs->mkdir($entityCacheDir, 0777); + } + + $this->processEmailAddressTemplate($entityCacheDir, $twig); + } + + /** + * {inheritdoc} + */ + public function isOptional() + { + return false; + } + + /** + * Create Filesystem object + * + * @return Filesystem + */ + protected function createFilesystem() + { + return new Filesystem(); + } + + /** + * Create Twig_Environment object + * + * @return \Twig_Environment + */ + protected function createTwigEnvironment() + { + $entityTemplateDir = __DIR__ . '/../Resources/cache/Entity'; + return new \Twig_Environment(new \Twig_Loader_Filesystem($entityTemplateDir)); + } + + /** + * Create a proxy class for EmailAddress entity and save it in cache + * + * @param string $entityCacheDir + * @param \Twig_Environment $twig + */ + protected function processEmailAddressTemplate($entityCacheDir, \Twig_Environment $twig) + { + $args = array(); + foreach ($this->emailOwnerClasses as $key => $emailOwnerClass) { + $prefix = strtolower(substr($emailOwnerClass, 0, strpos($emailOwnerClass, '\\'))); + if ($prefix === 'oro' || $prefix === 'orocrm') { + // do not use prefix if email's owner is a part of BAP and CRM + $prefix = ''; + } else { + $prefix .= '_'; + } + $suffix = strtolower(substr($emailOwnerClass, strrpos($emailOwnerClass, '\\') + 1)); + + $args[] = array( + 'targetEntity' => $emailOwnerClass, + 'columnName' => sprintf('owner_%s%s_id', $prefix, $suffix), + 'fieldName' => sprintf('owner%d', $key) + ); + } + + $className = sprintf($this->entityProxyNameTemplate, 'EmailAddress'); + $content = $twig->render( + 'EmailAddress.php.twig', + array( + 'namespace' => $this->entityCacheNamespace, + 'className' => $className, + 'owners' => $args + ) + ); + + $this->writeCacheFile(sprintf('%s/%s.php', $entityCacheDir, $className), $content); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php new file mode 100644 index 00000000000..13e0d1affb4 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailController.php @@ -0,0 +1,71 @@ +getRequest()->get('page', 1); + $limit = (int)$this->getRequest()->get('limit', self::ITEMS_PER_PAGE); + + return $this->handleGetListRequest($page, $limit); + } + + /** + * REST GET item + * + * @param string $id + * + * @ApiDoc( + * description="Get email", + * resource=true + * ) + * @AclAncestor("oro_email_view") + * @return Response + */ + public function getAction($id) + { + return $this->handleGetRequest($id); + } + + /** + * Get entity manager + * + * @return EmailApiEntityManager + */ + public function getManager() + { + return $this->container->get('oro_email.manager.email.api'); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php index d86c546bc4b..b53aaa4958b 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/Api/Rest/EmailTemplateController.php @@ -4,6 +4,7 @@ use FOS\Rest\Util\Codes; use Nelmio\ApiDocBundle\Annotation\ApiDoc; +use FOS\RestBundle\Controller\Annotations\Get as GetRoute; use FOS\RestBundle\Controller\Annotations\NamePrefix; use FOS\RestBundle\Controller\Annotations\RouteResource; @@ -13,6 +14,7 @@ use Oro\Bundle\UserBundle\Annotation\Acl; use Oro\Bundle\UserBundle\Annotation\AclAncestor; use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; +use Oro\Bundle\EmailBundle\Provider\VariablesProvider; use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; use Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository; @@ -93,6 +95,32 @@ public function getAction($entityName = null) ); } + /** + * REST GET available variables by entity name + * + * @param string $entityName + * + * @ApiDoc( + * description="Get available variables by entity name", + * resource=true + * ) + * @AclAncestor("oro_email_emailtemplate_update") + * @GetRoute(requirements={"entityName"="(.*)"}) + * @return Response + */ + public function getAvailableVariablesAction($entityName = null) + { + $entityName = str_replace('_', '\\', $entityName); + + /** @var VariablesProvider $provider */ + $provider = $this->get('oro_email.provider.variable_provider'); + $allowedData = $provider->getTemplateVariables($entityName); + + return $this->handleView( + $this->view($allowedData, Codes::HTTP_OK) + ); + } + /** * Get entity Manager * diff --git a/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php b/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php new file mode 100644 index 00000000000..995d0ab979e --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Controller/Api/Soap/EmailController.php @@ -0,0 +1,100 @@ +handleGetListRequest($page, $limit); + } + + /** + * @Soap\Method("getEmail") + * @Soap\Param("id", phpType = "int") + * @Soap\Result(phpType = "Oro\Bundle\EmailBundle\Entity\Email") + * @AclAncestor("oro_email_view") + */ + public function getAction($id) + { + return $this->handleGetRequest($id); + } + + /** + * @Soap\Method("getEmailBody") + * @Soap\Param("id", phpType="int") + * @Soap\Result(phpType="Oro\Bundle\EmailBundle\Entity\EmailBody") + * @AclAncestor("oro_email_view") + */ + public function getEmailBodyAction($id) + { + $entity = $this->getEntity($id); + $this->getEmailCacheManager()->ensureEmailBodyCached($entity); + + return $entity->getEmailBody(); + } + + /** + * @Soap\Method("getEmailAttachment") + * @Soap\Param("id", phpType="int") + * @Soap\Result(phpType="Oro\Bundle\EmailBundle\Entity\EmailAttachmentContent") + * @AclAncestor("oro_email_view") + */ + public function getEmailAttachment($id) + { + return $this->getEmailAttachmentContentEntity($id); + } + + /** + * Get email attachment by identifier. + * + * @param integer $attachmentId + * @return EmailAttachmentContent + * @throws \SoapFault + */ + protected function getEmailAttachmentContentEntity($attachmentId) + { + $attachment = $this->getManager()->findEmailAttachment($attachmentId); + + if (!$attachment) { + throw new \SoapFault('NOT_FOUND', sprintf('Record #%u can not be found', $attachmentId)); + } + + return $attachment->getContent(); + } + + /** + * Get entity manager + * + * @return EmailApiEntityManager + */ + public function getManager() + { + return $this->container->get('oro_email.manager.email.api'); + } + + /** + * Get email cache manager + * + * @return EmailCacheManager + */ + protected function getEmailCacheManager() + { + return $this->container->get('oro_email.email.cache.manager'); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Controller/EmailController.php b/src/Oro/Bundle/EmailBundle/Controller/EmailController.php new file mode 100644 index 00000000000..356bd59f3cc --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Controller/EmailController.php @@ -0,0 +1,147 @@ +getEmailCacheManager()->ensureEmailBodyCached($entity); + + return array( + 'entity' => $entity + ); + } + + /** + * Get email list + * TODO: This is a temporary action created for demo purposes. It will be removed when 'display activities' + * functionality is implemented + * + * @AclAncestor("oro_email_view") + * @Template + */ + public function activitiesAction($emails) + { + /** @var $emailRepository EmailRepository */ + $emailRepository = $this->getDoctrine()->getRepository('OroEmailBundle:Email'); + + $emails = $this->extractEmailAddresses($emails); + $rows = empty($emails) + ? array() + : $emailRepository->getEmailListQueryBuilder($emails)->getQuery()->execute(); + + return array( + 'entities' => $rows + ); + } + + /** + * Get the given email body content + * + * @Route("/body/{id}", name="oro_email_body", requirements={"id"="\d+"}) + * @AclAncestor("oro_email_view") + */ + public function bodyAction(EmailBody $entity) + { + return new Response($entity->getContent()); + } + + /** + * Get a response for download the given email attachment + * + * @Route("/attachment/{id}", name="oro_email_attachment", requirements={"id"="\d+"}) + * @AclAncestor("oro_email_view") + */ + public function attachmentAction(EmailAttachment $entity) + { + $response = new Response(); + $response->headers->set('Content-Type', $entity->getContentType()); + $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s"', $entity->getFileName())); + $response->headers->set('Content-Transfer-Encoding', $entity->getContent()->getContentTransferEncoding()); + $response->headers->set('Pragma', 'no-cache'); + $response->headers->set('Expires', '0'); + $response->setContent($entity->getContent()->getValue()); + + return $response; + } + + /** + * Get email cache manager + * + * @return EmailCacheManager + */ + protected function getEmailCacheManager() + { + return $this->container->get('oro_email.email.cache.manager'); + } + + /** + * Extract email addresses from the given argument. + * Always return an array, even if no any email is given. + * + * @param $emails + * @return string[] + * @throws \InvalidArgumentException + */ + protected function extractEmailAddresses($emails) + { + if (is_string($emails)) { + return empty($emails) + ? array() + : array($emails); + } + if (!is_array($emails) && !($emails instanceof \Traversable)) { + throw new \InvalidArgumentException('The emails argument must be a string, array or collection.'); + } + + $result = array(); + foreach ($emails as $email) { + if (is_string($email)) { + $result[] = $email; + } elseif ($email instanceof EmailInterface) { + $result[] = $email->getEmail(); + } else { + throw new \InvalidArgumentException( + 'Each item of the emails collection must be a string or an object of EmailInterface.' + ); + } + } + + return $result; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php b/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php index b9414cf2c07..53234d5fa94 100644 --- a/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php +++ b/src/Oro/Bundle/EmailBundle/Controller/EmailTemplateController.php @@ -2,7 +2,9 @@ namespace Oro\Bundle\EmailBundle\Controller; +use Doctrine\ORM\EntityManager; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\Form\FormInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -113,4 +115,44 @@ public function cloneAction(EmailTemplate $entity) { return $this->updateAction(clone $entity, true); } + + /** + * @Route("/preview/{id}", requirements={"id"="\d+"}, defaults={"id"=0})) + * @Acl( + * id="oro_email_emailtemplate_preview", + * name="Preview email template", + * description="Preview email template", + * parent="oro_email_emailtemplate" + * ) + * @Template("OroEmailBundle:EmailTemplate:preview.html.twig") + * @param bool|int $emailTemplateId + * @return array + */ + public function previewAction($emailTemplateId = false) + { + if (!$emailTemplateId) { + $emailTemplate = new EmailTemplate(); + } else { + /** @var EntityManager $em */ + $em = $this->get('doctrine.orm.entity_manager'); + $em->getRepository('Oro\Bundle\EmailBundle\Entity\EmailTemplate')->find($emailTemplateId); + } + + /** @var FormInterface $form */ + $form = $this->get('oro_email.form.emailtemplate'); + $form->setData($emailTemplate); + $request = $this->get('request'); + + if (in_array($request->getMethod(), array('POST', 'PUT'))) { + $form->submit($request); + } + + list ($subjectRendered, $templateRendered) = $this->get('oro_email.email_renderer') + ->compileMessage($emailTemplate); + + return array( + 'subject' => $subjectRendered, + 'content' => $templateRendered, + ); + } } diff --git a/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadEmailOriginData.php b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadEmailOriginData.php new file mode 100644 index 00000000000..fc4071207ef --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/DataFixtures/ORM/LoadEmailOriginData.php @@ -0,0 +1,24 @@ +setName('BAP'); + + $manager->persist($emailOrigin); + $manager->flush(); + } +} diff --git a/src/Oro/Bundle/EmailBundle/DataFixtures/data/emails/user/update_user.html.twig b/src/Oro/Bundle/EmailBundle/DataFixtures/data/emails/user/update_user.html.twig index 610c5c18c74..08f74a2ffcf 100644 --- a/src/Oro/Bundle/EmailBundle/DataFixtures/data/emails/user/update_user.html.twig +++ b/src/Oro/Bundle/EmailBundle/DataFixtures/data/emails/user/update_user.html.twig @@ -1,5 +1,5 @@ @entityName = Oro\Bundle\UserBundle\Entity\User -@subject = Subject {{ entity.username }} +@subject = Subject @isSystem = 1 -Some dude updated user '{{ entity.username }}'
\ No newline at end of file +Some dude updated user
diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplateDatagridManager.php b/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplateDatagridManager.php index 87d2a23dfab..eacf9f95f69 100644 --- a/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplateDatagridManager.php +++ b/src/Oro/Bundle/EmailBundle/Datagrid/EmailTemplateDatagridManager.php @@ -4,6 +4,9 @@ use Doctrine\ORM\QueryBuilder; +use Oro\Bundle\GridBundle\Action\MassAction\DeleteMassAction; +use Oro\Bundle\GridBundle\Datagrid\ResultRecordInterface; +use Oro\Bundle\GridBundle\Property\ActionConfigurationProperty; use Oro\Bundle\GridBundle\Property\UrlProperty; use Oro\Bundle\GridBundle\Action\ActionInterface; use Oro\Bundle\GridBundle\Field\FieldDescription; @@ -39,6 +42,14 @@ protected function getProperties() new UrlProperty('update_link', $this->router, 'oro_email_emailtemplate_update', array('id')), new UrlProperty('clone_link', $this->router, 'oro_email_emailtemplate_clone', array('id')), new UrlProperty('delete_link', $this->router, 'oro_api_delete_emailtemplate', array('id')), + new ActionConfigurationProperty( + function (ResultRecordInterface $record) { + if ($record->getValue('isSystem')) { + return array('delete' => false); + } + return null; + } + ) ); } @@ -47,25 +58,11 @@ protected function getProperties() */ protected function configureFields(FieldDescriptionCollection $fieldsCollection) { - $fieldId = new FieldDescription(); - $fieldId->setName('id'); - $fieldId->setOptions( - array( - 'type' => FieldDescriptionInterface::TYPE_INTEGER, - 'label' => $this->translate('ID'), - 'field_name' => 'id', - 'filter_type' => FilterInterface::TYPE_NUMBER, - 'show_column' => false - ) - ); - $fieldsCollection->add($fieldId); - /*----------------------------------------------------------------*/ - $fieldEntityName = new FieldDescription(); $fieldEntityName->setName('entityName'); $fieldEntityName->setOptions( array( - 'type' => FieldDescriptionInterface::TYPE_TEXT, + 'type' => FieldDescriptionInterface::TYPE_HTML, 'label' => $this->translate('oro.email.datagrid.emailtemplate.column.entity_name'), 'field_name' => 'entityName', 'filter_type' => FilterInterface::TYPE_CHOICE, diff --git a/src/Oro/Bundle/EmailBundle/DependencyInjection/Compiler/EmailOwnerConfigurationPass.php b/src/Oro/Bundle/EmailBundle/DependencyInjection/Compiler/EmailOwnerConfigurationPass.php new file mode 100644 index 00000000000..6b56b39865d --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/DependencyInjection/Compiler/EmailOwnerConfigurationPass.php @@ -0,0 +1,76 @@ +hasDefinition(self::SERVICE_KEY)) { + return; + } + $storageDefinition = $container->getDefinition(self::SERVICE_KEY); + + $providers = $this->loadProviders($container); + foreach ($providers as $providerServiceId) { + $storageDefinition->addMethodCall('addProvider', array(new Reference($providerServiceId))); + } + + $this->setEmailAddressEntityResolver($container); + } + + /** + * Load services implements an email owner providers + * + * @param ContainerBuilder $container + * @return array + */ + protected function loadProviders(ContainerBuilder $container) + { + $taggedServices = $container->findTaggedServiceIds(self::TAG); + $providers = array(); + foreach ($taggedServices as $id => $tagAttributes) { + $order = PHP_INT_MAX; + foreach ($tagAttributes as $attributes) { + if (!empty($attributes['order'])) { + $order = (int)$attributes['order']; + break; + } + } + $providers[$order] = $id; + } + ksort($providers); + + return $providers; + } + + /** + * Register a proxy of EmailAddress entity in doctrine ORM + * + * @param ContainerBuilder $container + */ + protected function setEmailAddressEntityResolver(ContainerBuilder $container) + { + if ($container->hasDefinition('doctrine.orm.listeners.resolve_target_entity')) { + $targetEntityResolver = $container->getDefinition('doctrine.orm.listeners.resolve_target_entity'); + $targetEntityResolver->addMethodCall( + 'addResolveTargetEntity', + array( + 'Oro\Bundle\EmailBundle\Entity\EmailAddress', + sprintf('%s\EmailAddressProxy', $container->getParameter('oro_email.entity.cache_namespace')), + array() + ) + ); + } + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Email.php b/src/Oro/Bundle/EmailBundle/Entity/Email.php new file mode 100644 index 00000000000..11d475ff630 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Email.php @@ -0,0 +1,508 @@ +importance = self::NORMAL_IMPORTANCE; + $this->recipients = new ArrayCollection(); + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Get entity created date/time + * + * @return \DateTime + */ + public function getCreatedAt() + { + return $this->created; + } + + /** + * Get email subject + * + * @return string + */ + public function getSubject() + { + return $this->subject; + } + + /** + * Set email subject + * + * @param string $subject + * @return $this + */ + public function setSubject($subject) + { + $this->subject = $subject; + + return $this; + } + + /** + * Get FROM email name + * + * @return string + */ + public function getFromName() + { + return $this->fromName; + } + + /** + * Set FROM email name + * + * @param string $fromName + * @return $this + */ + public function setFromName($fromName) + { + $this->fromName = $fromName; + + return $this; + } + + /** + * Get FROM email address + * + * @return EmailAddress + */ + public function getFromEmailAddress() + { + return $this->fromEmailAddress; + } + + /** + * Set FROM email address + * + * @param EmailAddress $fromEmailAddress + * @return $this + */ + public function setFromEmailAddress(EmailAddress $fromEmailAddress) + { + $this->fromEmailAddress = $fromEmailAddress; + + return $this; + } + + /** + * Get email recipients + * + * @param null|string $recipientType null to get all recipients, + * or 'to', 'cc' or 'bcc' if you need specific type of recipients + * @return EmailRecipient[] + */ + public function getRecipients($recipientType = null) + { + if ($recipientType === null) { + return $this->recipients; + } + + return $this->recipients->filter( + function ($recipient) use ($recipientType) { + /** @var EmailRecipient $recipient */ + return $recipient->getType() === $recipientType; + } + ); + } + + /** + * Add folder + * + * @param EmailRecipient $recipient + * @return $this + */ + public function addRecipient(EmailRecipient $recipient) + { + $this->recipients[] = $recipient; + + $recipient->setEmail($this); + + return $this; + } + + /** + * Get date/time when email received + * + * @return \DateTime + */ + public function getReceivedAt() + { + return $this->receivedAt; + } + + /** + * Set date/time when email received + * + * @param \DateTime $receivedAt + * @return $this + */ + public function setReceivedAt($receivedAt) + { + $this->receivedAt = $receivedAt; + + return $this; + } + + /** + * Get date/time when email sent + * + * @return \DateTime + */ + public function getSentAt() + { + return $this->sentAt; + } + + /** + * Set date/time when email sent + * + * @param \DateTime $sentAt + * @return $this + */ + public function setSentAt($sentAt) + { + $this->sentAt = $sentAt; + + return $this; + } + + /** + * Get email importance + * + * @return integer Can be one of *_IMPORTANCE constants + */ + public function getImportance() + { + return $this->importance; + } + + /** + * Set email importance + * + * @param integer $importance Can be one of *_IMPORTANCE constants + * @return $this + */ + public function setImportance($importance) + { + $this->importance = $importance; + + return $this; + } + + /** + * Get email internal date receives from an email server + * + * @return \DateTime + */ + public function getInternalDate() + { + return $this->internalDate; + } + + /** + * Set email internal date receives from an email server + * + * @param \DateTime $internalDate + * @return $this + */ + public function setInternalDate($internalDate) + { + $this->internalDate = $internalDate; + + return $this; + } + + /** + * Get value of email Message-ID header + * + * @return string + */ + public function getMessageId() + { + return $this->messageId; + } + + /** + * Set value of email Message-ID header + * + * @param string $messageId + * @return $this + */ + public function setMessageId($messageId) + { + $this->messageId = $messageId; + + return $this; + } + + /** + * Get email message id uses for group related messages + * + * @return string + */ + public function getXMessageId() + { + return $this->xMessageId; + } + + /** + * Set email message id uses for group related messages + * + * @param string $xMessageId + * @return $this + */ + public function setXMessageId($xMessageId) + { + $this->xMessageId = $xMessageId; + + return $this; + } + + /** + * Get email thread id uses for group related messages + * + * @return string + */ + public function getXThreadId() + { + return $this->xThreadId; + } + + /** + * Set email thread id uses for group related messages + * + * @param string $xThreadId + * @return $this + */ + public function setXThreadId($xThreadId) + { + $this->xThreadId = $xThreadId; + + return $this; + } + + /** + * Get email folder + * + * @return EmailFolder + */ + public function getFolder() + { + return $this->folder; + } + + /** + * Set email folder + * + * @param EmailFolder $folder + * @return $this + */ + public function setFolder(EmailFolder $folder) + { + $this->folder = $folder; + + return $this; + } + + /** + * Get cached email body + * + * @return EmailBody + */ + public function getEmailBody() + { + return $this->emailBody; + } + + /** + * Set email body + * + * @param EmailBody $emailBody + * @return $this + */ + public function setEmailBody(EmailBody $emailBody) + { + $this->emailBody = $emailBody; + + return $this; + } + + /** + * Pre persist event listener + * + * @ORM\PrePersist + */ + public function beforeSave() + { + $this->created = EmailUtil::currentUTCDateTime(); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php b/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php new file mode 100644 index 00000000000..58136a1018b --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailAddress.php @@ -0,0 +1,131 @@ +id; + } + + /** + * Get entity created date/time + * + * @return \DateTime + */ + public function getCreatedAt() + { + return $this->created; + } + + /** + * Get entity updated date/time + * + * @return \DateTime + */ + public function getUpdatedAt() + { + return $this->updated; + } + + /** + * Get email address. + * + * @return string + */ + public function getEmail() + { + return $this->email; + } + + /** + * Set email address. + * + * @param string $email + * @return $this + */ + public function setEmail($email) + { + $this->email = $email; + + return $this; + } + + /** + * Get email owner + * + * @return EmailOwnerInterface + */ + public function getOwner() + { + return null; + } + + /** + * Set email owner + * + * @param EmailOwnerInterface|null $owner + * @return $this + */ + public function setOwner(EmailOwnerInterface $owner = null) + { + return $this; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php new file mode 100644 index 00000000000..11db7b89793 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachment.php @@ -0,0 +1,168 @@ +id; + } + + /** + * Get attachment file name + * + * @return string + */ + public function getFileName() + { + return $this->fileName; + } + + /** + * Set attachment file name + * + * @param string $fileName + * @return $this + */ + public function setFileName($fileName) + { + $this->fileName = $fileName; + + return $this; + } + + /** + * Get content type. It may be any MIME type + * + * @return string + */ + public function getContentType() + { + return $this->contentType; + } + + /** + * Set content type + * + * @param string $contentType any MIME type + * @return $this + */ + public function setContentType($contentType) + { + $this->contentType = $contentType; + + return $this; + } + + /** + * Get content of email attachment + * + * @return EmailAttachmentContent + */ + public function getContent() + { + return $this->attachmentContent; + } + + /** + * Set content of email attachment + * + * @param EmailAttachmentContent $attachmentContent + * @return $this + */ + public function setContent(EmailAttachmentContent $attachmentContent) + { + $this->attachmentContent = $attachmentContent; + + $attachmentContent->setEmailAttachment($this); + + return $this; + } + + /** + * Get email body + * + * @return EmailBody + */ + public function getEmailBody() + { + return $this->emailBody; + } + + /** + * Set email body + * + * @param EmailBody $emailBody + * @return $this + */ + public function setEmailBody(EmailBody $emailBody) + { + $this->emailBody = $emailBody; + + return $this; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php new file mode 100644 index 00000000000..a3ab42eb4cd --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailAttachmentContent.php @@ -0,0 +1,133 @@ +id; + } + + /** + * Get email attachment owner + * + * @return EmailAttachment + */ + public function getEmailAttachment() + { + return $this->emailAttachment; + } + + /** + * Set email attachment owner + * + * @param EmailAttachment $emailAttachment + * @return $this + */ + public function setEmailAttachment(EmailAttachment $emailAttachment) + { + $this->emailAttachment = $emailAttachment; + + return $this; + } + + /** + * Get attachment content + * + * @return string + */ + public function getValue() + { + return $this->content; + } + + /** + * Set attachment content + * + * @param string $content + * @return $this + */ + public function setValue($content) + { + $this->content = $content; + + return $this; + } + + /** + * Get encoding type of attachment content + * + * @return string + */ + public function getContentTransferEncoding() + { + return $this->contentTransferEncoding; + } + + /** + * Set encoding type of attachment content + * + * @param string $contentTransferEncoding + * @return $this + */ + public function setContentTransferEncoding($contentTransferEncoding) + { + $this->contentTransferEncoding = $contentTransferEncoding; + + return $this; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php b/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php new file mode 100644 index 00000000000..898ab703f7a --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailBody.php @@ -0,0 +1,271 @@ +bodyIsText = false; + $this->hasAttachments = false; + $this->persistent = false; + $this->attachments = new ArrayCollection(); + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Get entity created date/time + * + * @return \DateTime + */ + public function getCreatedAt() + { + return $this->created; + } + + /** + * Get body content. + * + * @return string + */ + public function getContent() + { + return $this->bodyContent; + } + + /** + * Set body content. + * + * @param string $bodyContent + * @return $this + */ + public function setContent($bodyContent) + { + $this->bodyContent = $bodyContent; + + return $this; + } + + /** + * Indicate whether email body is a text or html. + * + * @return bool true if body is text/plain; otherwise, the body content is text/html + */ + public function getBodyIsText() + { + return $this->bodyIsText; + } + + /** + * Set body content type. + * + * @param bool $bodyIsText true for text/plain, false for text/html + * @return $this + */ + public function setBodyIsText($bodyIsText) + { + $this->bodyIsText = $bodyIsText; + + return $this; + } + + /** + * Indicate whether email has attachments or not. + * + * @return bool true if body is text/plain; otherwise, the body content is text/html + */ + public function getHasAttachments() + { + return $this->hasAttachments; + } + + /** + * Set flag indicates whether there are attachments or not. + * + * @param bool $hasAttachments + * @return $this + */ + public function setHasAttachments($hasAttachments) + { + $this->hasAttachments = $hasAttachments; + + return $this; + } + + /** + * Indicate whether email is persistent or not. + * + * @return bool true if this email newer removed from the cache; otherwise, false + */ + public function getPersistent() + { + return $this->persistent; + } + + /** + * Set flag indicates whether email can be removed from the cache or not. + * + * @param bool $persistent true if this email newer removed from the cache; otherwise, false + * @return $this + */ + public function setPersistent($persistent) + { + $this->persistent = $persistent; + + return $this; + } + + /** + * Get email header + * + * @return Email + */ + public function getHeader() + { + return $this->header; + } + + /** + * Set email header + * + * @param Email $header + * @return $this + */ + public function setHeader(Email $header) + { + $this->header = $header; + + return $this; + } + + /** + * Get email attachments + * + * @return EmailAttachment[] + */ + public function getAttachments() + { + return $this->attachments; + } + + /** + * Add email attachment + * + * @param EmailAttachment $attachment + * @return $this + */ + public function addAttachment(EmailAttachment $attachment) + { + $this->setHasAttachments(true); + + $this->attachments[] = $attachment; + + $attachment->setEmailBody($this); + + return $this; + } + + /** + * Pre persist event listener + * + * @ORM\PrePersist + */ + public function beforeSave() + { + $this->created = EmailUtil::currentUTCDateTime(); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php b/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php new file mode 100644 index 00000000000..a2f1956726d --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailFolder.php @@ -0,0 +1,178 @@ +emails = new ArrayCollection(); + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Get folder name + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Set folder name + * + * @param string $name + * @return $this + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + + /** + * Get folder type. + * + * @return string Can be 'inbox', 'sent', 'trash', 'drafts' or 'other' + */ + public function getType() + { + return $this->type; + } + + /** + * Set folder type + * + * @param string $type Can be 'inbox', 'sent', 'trash', 'drafts' or 'other' + * @return $this + */ + public function setType($type) + { + $this->type = $type; + + return $this; + } + + /** + * Get email folder origin + * + * @return EmailOrigin + */ + public function getOrigin() + { + return $this->origin; + } + + /** + * Set email folder origin + * + * @param EmailOrigin $origin + * @return $this + */ + public function setOrigin(EmailOrigin $origin) + { + $this->origin = $origin; + + return $this; + } + + /** + * Get emails + * + * @return Email[] + */ + public function getEmails() + { + return $this->emails; + } + + /** + * Add email + * + * @param Email $email + * @return $this + */ + public function addEmail(Email $email) + { + $this->emails[] = $email; + + $email->setFolder($this); + + return $this; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailInterface.php b/src/Oro/Bundle/EmailBundle/Entity/EmailInterface.php new file mode 100644 index 00000000000..7eab1bf5518 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailInterface.php @@ -0,0 +1,34 @@ +folders = new ArrayCollection(); + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Get email origin name + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Set email origin name + * + * @param string $name + * @return $this + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + + /** + * Get email folders + * + * @return EmailFolder[] + */ + public function getFolders() + { + return $this->folders; + } + + /** + * Add folder + * + * @param EmailFolder $folder + * @return $this + */ + public function addFolder(EmailFolder $folder) + { + $this->folders[] = $folder; + + $folder->setOrigin($this); + + return $this; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailOwnerInterface.php b/src/Oro/Bundle/EmailBundle/Entity/EmailOwnerInterface.php new file mode 100644 index 00000000000..96ced7e2357 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailOwnerInterface.php @@ -0,0 +1,54 @@ +id; + } + + /** + * Get full email name + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Set full email name + * + * @param string $name + * @return $this + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + + /** + * Get recipient type. + * + * @return string Can be 'to', 'cc' or 'bcc' + */ + public function getType() + { + return $this->type; + } + + /** + * Set recipient type + * + * @param string $type Can be 'to', 'cc' or 'bcc' + * @return $this + */ + public function setType($type) + { + $this->type = $type; + + return $this; + } + + /** + * Get email address + * + * @return EmailAddress + */ + public function getEmailAddress() + { + return $this->emailAddress; + } + + /** + * Set email address + * + * @param EmailAddress $emailAddress + * @return $this + */ + public function setEmailAddress(EmailAddress $emailAddress) + { + $this->emailAddress = $emailAddress; + + return $this; + } + + /** + * Get email + * + * @return Email + */ + public function getEmail() + { + return $this->email; + } + + /** + * Set email + * + * @param Email $email + * @return $this + */ + public function setEmail(Email $email) + { + $this->email = $email; + + return $this; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php b/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php index 7433befd921..3757d8cb09e 100644 --- a/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php +++ b/src/Oro/Bundle/EmailBundle/Entity/EmailTemplate.php @@ -10,6 +10,8 @@ use Symfony\Component\Validator\Constraints as Assert; +use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Configurable; + /** * EmailTemplate * @@ -19,7 +21,7 @@ * @ORM\Index(name="email_is_system_idx", columns={"isSystem"}), * @ORM\Index(name="email_entity_name_idx", columns={"entityName"})}) * @ORM\Entity(repositoryClass="Oro\Bundle\EmailBundle\Entity\Repository\EmailTemplateRepository") - * @Gedmo\TranslationEntity(class="Oro\Bundle\EmailBundle\Entity\EmailTemplateTranslation")* + * @Gedmo\TranslationEntity(class="Oro\Bundle\EmailBundle\Entity\EmailTemplateTranslation") */ class EmailTemplate implements Translatable { @@ -356,6 +358,14 @@ public function __clone() $this->parent = $this->id; $this->id = null; $this->isSystem = false; + + if ($this->getTranslations() instanceof ArrayCollection) { + $clonedTranslations = new ArrayCollection(); + foreach ($this->getTranslations() as $translation) { + $clonedTranslations->add(clone $translation); + } + $this->setTranslations($clonedTranslations); + } } /** diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php new file mode 100644 index 00000000000..82162bb047a --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailAddressManager.php @@ -0,0 +1,66 @@ +entityCacheNamespace = $entityCacheNamespace; + $this->entityProxyNameTemplate = $entityProxyNameTemplate; + } + + /** + * Create EmailAddress entity object. Actually a proxy class is created + * + * @return EmailAddress + */ + public function newEmailAddress() + { + $emailAddressClass = $this->getEmailAddressProxyClass(); + + return new $emailAddressClass(); + } + + /** + * Get a repository for EmailAddress entity + * + * @param EntityManager $em + * @return EntityRepository + */ + public function getEmailAddressRepository(EntityManager $em) + { + return $em->getRepository($this->getEmailAddressProxyClass()); + } + + /** + * Get full class name of a proxy of EmailAddress entity + * + * @return string + */ + protected function getEmailAddressProxyClass() + { + return sprintf('%s\%s', $this->entityCacheNamespace, sprintf($this->entityProxyNameTemplate, 'EmailAddress')); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php new file mode 100644 index 00000000000..d40320fb753 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailApiEntityManager.php @@ -0,0 +1,32 @@ +getEmailAttachmentRepository()->find($id); + } + + /** + * Get email attachment repository + * + * @return ObjectRepository + */ + public function getEmailAttachmentRepository() + { + return $this->getObjectManager()->getRepository('Oro\Bundle\EmailBundle\Entity\EmailAttachment'); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php new file mode 100644 index 00000000000..660e5529ae5 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/EmailOwnerManager.php @@ -0,0 +1,223 @@ +getProviders() as $provider) { + $fieldName = sprintf('owner%d', count($this->emailOwnerClasses) + 1); + $this->emailOwnerClasses[$fieldName] = $provider->getEmailOwnerClass(); + } + $this->emailAddressManager = $emailAddressManager; + } + + /** + * Handle onFlush event + * + * @param OnFlushEventArgs $event + */ + public function handleOnFlush(OnFlushEventArgs $event) + { + $em = $event->getEntityManager(); + $uow = $em->getUnitOfWork(); + $needChangeSetsComputing = false; + + $needChangeSetsComputing |= $this->handleInsertionsOrUpdates($uow->getScheduledEntityInsertions(), $em, $uow); + $needChangeSetsComputing |= $this->handleInsertionsOrUpdates($uow->getScheduledEntityUpdates(), $em, $uow); + $needChangeSetsComputing |= $this->handleDeletions($uow->getScheduledEntityDeletions(), $em); + + if ($needChangeSetsComputing) { + $uow->computeChangeSets(); + } + } + + /** + * @param array $entities + * @param EntityManager $em + * @param UnitOfWork $uow + * @return bool true if UnitOfWork change set need to be recomputed + */ + protected function handleInsertionsOrUpdates(array $entities, EntityManager $em, UnitOfWork $uow) + { + $needChangeSetsComputing = false; + foreach ($entities as $entity) { + if ($entity instanceof EmailOwnerInterface) { + $needChangeSetsComputing |= $this->processInsertionOrUpdateEntity( + $entity->getPrimaryEmailField(), + $entity, + $entity, + $em, + $uow + ); + } elseif ($entity instanceof EmailInterface) { + $needChangeSetsComputing |= $this->processInsertionOrUpdateEntity( + $entity->getEmailField(), + $entity, + $entity->getEmailOwner(), + $em, + $uow + ); + } + } + + return $needChangeSetsComputing; + } + + /** + * @param $emailField + * @param mixed $entity + * @param EmailOwnerInterface $owner + * @param EntityManager $em + * @param UnitOfWork $uow + * @return bool true if UnitOfWork change set need to be recomputed + */ + protected function processInsertionOrUpdateEntity( + $emailField, + $entity, + EmailOwnerInterface $owner, + EntityManager $em, + UnitOfWork $uow + ) { + $needChangeSetsComputing = false; + if (!empty($emailField)) { + foreach ($uow->getEntityChangeSet($entity) as $field => $vals) { + if ($field === $emailField) { + list($oldValue, $newValue) = $vals; + if ($newValue !== $oldValue) { + $needChangeSetsComputing |= $this->bindEmailAddress($em, $owner, $newValue, $oldValue); + } + } + } + } + + return $needChangeSetsComputing; + } + + /** + * @param array $entities + * @param EntityManager $em + * @return bool true if UnitOfWork change set need to be recomputed + */ + protected function handleDeletions(array $entities, EntityManager $em) + { + $needChangeSetsComputing = false; + foreach ($entities as $entity) { + if ($entity instanceof EmailOwnerInterface) { + $needChangeSetsComputing |= $this->unbindEmailAddress($em, $entity); + } elseif ($entity instanceof EmailInterface) { + $needChangeSetsComputing |= $this->unbindEmailAddress($em, $entity->getEmailOwner(), $entity); + } + } + + return $needChangeSetsComputing; + } + + /** + * Bind EmailAddress entity to the given owner + * + * @param EntityManager $em + * @param EmailOwnerInterface $owner + * @param string $newEmail + * @param string $oldEmail + * @return bool true if UnitOfWork change set need to be recomputed + */ + protected function bindEmailAddress(EntityManager $em, EmailOwnerInterface $owner, $newEmail, $oldEmail) + { + $result = false; + $repository = $this->emailAddressManager->getEmailAddressRepository($em); + if (!empty($newEmail)) { + $emailAddress = $repository->findOneBy(array('email' => $newEmail)); + if ($emailAddress === null) { + $em->persist($this->createEmailAddress($newEmail, $owner)); + $result = true; + } elseif ($emailAddress->getOwner() != $owner) { + $emailAddress->setOwner($owner); + $result = true; + } + } + if (!empty($oldEmail)) { + $emailAddress = $repository->findOneBy(array('email' => $oldEmail)); + if ($emailAddress !== null) { + $emailAddress->setOwner(null); + $result = true; + } + } + + return $result; + } + + /** + * Unbind EmailAddress entity from the given owner + * + * @param EntityManager $em + * @param EmailOwnerInterface $owner + * @param EmailInterface $email + * @return bool true if UnitOfWork change set need to be recomputed + */ + protected function unbindEmailAddress(EntityManager $em, EmailOwnerInterface $owner, EmailInterface $email = null) + { + $result = false; + $repository = $this->emailAddressManager->getEmailAddressRepository($em); + foreach ($this->emailOwnerClasses as $fieldName => $emailOwnerClass) { + $condition = array($fieldName => $owner); + if ($email !== null) { + $condition['email'] = $email->getEmail(); + } + /** @var EmailAddress $emailAddress */ + foreach ($repository->findBy($condition) as $emailAddress) { + $emailAddress->setOwner(null); + $result = true; + } + } + + return $result; + } + + /** + * Create EmailAddress entity object + * + * @param string $email + * @param EmailOwnerInterface $owner + * @return EmailAddress + */ + protected function createEmailAddress($email, EmailOwnerInterface $owner) + { + return $this->emailAddressManager->newEmailAddress() + ->setEmail($email) + ->setOwner($owner); + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php new file mode 100644 index 00000000000..aeb807f5d0e --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProvider.php @@ -0,0 +1,47 @@ +emailOwnerProviderStorage = $emailOwnerProviderStorage; + } + + /** + * Find an entity object which is an owner of the given email address + * + * @param \Doctrine\ORM\EntityManager $em + * @param string $email + * @return EmailOwnerInterface + */ + public function findEmailOwner(EntityManager $em, $email) + { + $emailOwner = null; + foreach ($this->emailOwnerProviderStorage->getProviders() as $provider) { + $emailOwner = $provider->findEmailOwner($em, $email); + if ($emailOwner !== null) { + break; + } + } + + return $emailOwner; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProviderInterface.php b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProviderInterface.php new file mode 100644 index 00000000000..8fda66a66fb --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Provider/EmailOwnerProviderInterface.php @@ -0,0 +1,28 @@ +emailOwnerProviders[] = $provider; + } + + /** + * Get all email owner providers + * + * @return EmailOwnerProviderInterface[] + */ + public function getProviders() + { + return $this->emailOwnerProviders; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailRepository.php new file mode 100644 index 00000000000..c18fd7c02d3 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailRepository.php @@ -0,0 +1,51 @@ +getEntityManager()->createQueryBuilder() + ->select('re.id') + ->from('OroEmailBundle:Email', 're') + ->innerJoin('re.recipients', 'r') + ->innerJoin('r.emailAddress', 'ra'); + $qbRecipients->where($qbRecipients->expr()->in('ra.email', $emails)); + + $qb = $this->createQueryBuilder('e') + ->select('partial e.{id, fromName, subject, sentAt}, a') + ->innerJoin('e.fromEmailAddress', 'a') + ->orderBy('e.sentAt', 'DESC'); + $qb->where( + $qb->expr()->orX( + $qb->expr()->in('e.id', $qbRecipients->getDQL()), + $qb->expr()->in('a.email', $emails) + ) + ); + + if ($firstResult !== null) { + $qb->setFirstResult($firstResult); + } + if ($maxResults !== null) { + $qb->setMaxResults($maxResults); + } + + return $qb; + } +} diff --git a/src/Oro/Bundle/EmailBundle/Entity/Util/EmailUtil.php b/src/Oro/Bundle/EmailBundle/Entity/Util/EmailUtil.php new file mode 100644 index 00000000000..4f004d4be29 --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Entity/Util/EmailUtil.php @@ -0,0 +1,48 @@ +; 'pure' email address john@example.com + * email address: John Smith
+
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/activity.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/activity.html.twig
new file mode 100644
index 00000000000..bb16624a711
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/activity.html.twig
@@ -0,0 +1,11 @@
+{#
+ Available variables:
+ * entity - email entity Oro\Bundle\EmailBundle\Entity\Email
+#}
+{# TODO: This is a demo template. It need to be replaced with a real one #}
+
+
+
+
+
+
+
+
+
+
+
+ | From | +Subject | +Sent | +
|---|
+ {% block content %}
+
+{% endblock %}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
new file mode 100644
index 00000000000..f390f679f5d
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
@@ -0,0 +1,22 @@
+{#
+ Available variables:
+ * entity - email entity Oro\Bundle\EmailBundle\Entity\Email
+ * indexer_item - indexer item Oro\Bundle\SearchBundle\Query\Result\Item
+#}
+{% extends 'OroSearchBundle:Search:searchResultItem.html.twig' %}
+{% import 'OroUserBundle::macros.html.twig' as UI %}
+{% import 'OroEmailBundle::macros.html.twig' as EA %}
+
+{% set format = oro_config_value('oro_user.name_format') %}
+{% set iconType = 'envelope' %}
+
+{% set recordUrl = indexer_item.recordUrl %}
+{% set title = entity ? entity.subject : indexer_item.recordTitle %}
+
+{% set entityType = 'Email'|trans %}
+
+{% set entityInfo = [
+{'title': 'Sent', 'value': UI.time(entity.sentAt)},
+{'title': 'From', 'value': EA.email_address(entity.fromEmailAddress, entity.fromName, format)},
+{'title': 'To', 'value': EA.recipient_email_addresses(entity.recipients('to'), format)},
+] %}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/view.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/view.html.twig
new file mode 100644
index 00000000000..a026899a324
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/view.html.twig
@@ -0,0 +1,55 @@
+{#
+ Available variables:
+ * entity - email entity Oro\Bundle\EmailBundle\Entity\Email
+#}
+{% extends 'OroUIBundle:actions:view.html.twig' %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
+{% import 'OroEmailBundle::macros.html.twig' as EA %}
+{% set format = oro_config_value('oro_user.name_format') %}
+{% oro_title_set({params : {"%subject%": entity.subject} }) %}
+
+{% block pageHeader %}
+ {% set breadcrumbs = {'entity': entity, 'indexLabel': 'Emails', 'entityTitle': entity.subject } %}
+ {{ parent() }}
+{% endblock pageHeader %}
+
+{% block stats %}
+
+
+ {% endblock %}
+
+ {{ UI.attibuteRow('Sent', UI.time(entity.sentAt)) }}
+ {{ UI.attibuteRow('From', EA.email_address(entity.fromEmailAddress, entity.fromName, format, true)) }}
+ {{ UI.attibuteRow('To', EA.recipient_email_addresses(entity.recipients('to'), format, true)) }}
+ {{ UI.attibuteRow('Cc', EA.recipient_email_addresses(entity.recipients('cc'), format, true)) }}
+ {{ UI.attibuteRow('Bcc', EA.recipient_email_addresses(entity.recipients('bcc'), format, true)) }}
+ {{ UI.attibuteRow('Subject', entity.subject) }}
+ {% if entity.emailBody.hasAttachments %}
+ {{ UI.attibuteRow('Attachments', EA.attachments(entity.emailBody.attachments)) }}
+ {% endif %}
+ {{ EA.body(entity.emailBody, 'scrollable-container') }}
+
+ Subject: {{ subject }}
#} +{{ content|raw }} \ No newline at end of file diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/EmailTemplate/update.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/EmailTemplate/update.html.twig index ca3e9897db8..079e0558a42 100644 --- a/src/Oro/Bundle/EmailBundle/Resources/views/EmailTemplate/update.html.twig +++ b/src/Oro/Bundle/EmailBundle/Resources/views/EmailTemplate/update.html.twig @@ -2,9 +2,10 @@ {% form_theme form with [ 'OroUIBundle:Form:fields.html.twig', ]%} +{% import 'OroEmailBundle::macros.html.twig' as _emailMacros %} {% set title = form.vars.value.id ? 'Edit email template "%name%"'|trans({'%name%': form.vars.value.name}) - : isClone ? 'Clone Email Template'|trans : 'Add Email Template'|trans + : isClone ? 'Clone Email Template'|trans : 'New Email Template'|trans %} {% if form.vars.value.id %} {% oro_title_set({params : {"%name%": form.vars.value.name} }) %} @@ -16,6 +17,19 @@ %} {% block navButtons %} + {% if resource_granted('oro_email_emailtemplate_preview') %} + {{ UI.button({ + 'path' : path('oro_email_emailtemplate_preview', {'id': form.vars.value.id }), + 'title' : 'Preview', + 'label' : 'Preview', + aClass: 'btn-success dialog-form-renderer no-hash', + iClass: 'icon-share' + }) + }} + + {{ _emailMacros.renderPreviewDialog(form.vars.id, form.vars.value.subject) }} + {% endif %} + {% if form.vars.value.id and resource_granted('oro_email_emailtemplate_clone') %} {{ UI.button({ 'path' : path('oro_email_emailtemplate_clone', {'id': form.vars.value.id}), @@ -27,6 +41,7 @@ }} {{ UI.buttonSeparator() }} {% endif %} + {% set cancelButton = UI.button({'path' : path('oro_email_emailtemplate_index'), 'title' : 'Cancel', 'label' : 'Cancel'}) %} {% if form.vars.value.isSystem == false %} {% if form.vars.value.id and resource_granted('oro_email_emailtemplate_remove') %} @@ -89,13 +104,17 @@ 'data': [ form_widget(form.translations) ] + },{ + 'title': 'Available variables'|trans, + 'data': [ + _emailMacros.renderAvailableVariablesWidget(form.vars.value.entityName, form.entityName.vars.id) + ] }] }] %} {% set data = { 'formErrors': form_errors(form)? form_errors(form) : null, 'dataBlocks': dataBlocks, - 'hiddenData': form_rest(form) } %} diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig new file mode 100644 index 00000000000..f6442fbff0b --- /dev/null +++ b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig @@ -0,0 +1,187 @@ +{% macro renderAvailableVariablesWidget(entityName, dependentFieldId) %} + + + + + +{% endmacro %} + +{% macro renderPreviewDialog(formName, title) %} + +{% endmacro %} + +{# + Render email address name, owner name or a link to owner view page can be rendered depends on given parameters + Parameters: + emailAddress - email address entity Oro\Bundle\EmailBundle\Entity\EmailAddress + emailAddressName - a string contains an email address. It is used if the email address has no owner + nameFormat - a format string used to render the owner full name + noLink - determines whether the rendering of a link to the owner view page is forbidden or not. Default value is false +#} +{% macro email_address(emailAddress, emailAddressName, nameFormat, noLink) -%} + {% macro email_address_text(emailAddress, nameFormat) -%} + {{ emailAddress.owner.fullname(nameFormat)|default('N/A')|raw }} + {%- endmacro -%} + {% macro email_address_link(emailAddress, nameFormat) -%} + {#- TODO: we need EntityConfig to get view url for an entity -#} + {{ _self.email_address_text(emailAddress, nameFormat) }} + {%- endmacro -%} + {% if emailAddress.owner is null -%} + {{ emailAddressName|raw }} + {%- else -%} + {% if noLink|default(false) -%} + {{ _self.email_address_text(emailAddress, nameFormat)|raw }} + {%- else -%} + {{ _self.email_address_link(emailAddress, nameFormat)|raw }} + {%- endif %} + {%- endif %} +{%- endmacro %} + +{# + Render the given email recipients + Parameters: + recipients - an array of Oro\Bundle\EmailBundle\Entity\EmailRecipients + nameFormat - a format string used to render the owner full name + noLink - determines whether the rendering of a link to the owner view page is forbidden or not. Default value is false +#} +{% macro recipient_email_addresses(recipients, nameFormat, noLink) -%} + {% set addreses = {} -%} + {% for recipient in recipients -%} + {{ _self.email_address(recipient.emailAddress, recipient.name, nameFormat, noLink) }} + {%- if not loop.last %}; {% endif %} + {%- endfor %} +{%- endmacro %} + +{# + Render the given email attachments + Parameters: + attachments - an array of Oro\Bundle\EmailBundle\Entity\EmailAttachment +#} +{% macro attachments(attachments) -%} + {% macro attachment_row_data(values) -%} + {%- for val in values -%} + + {{ val.fileName }} + + {%- endfor -%} + {%- endmacro -%} + {{ _self.attachment_row_data(attachments)|raw }} +{%- endmacro %} + +{# + Render email body + Parameters: + emailBody - email body entity Oro\Bundle\EmailBundle\Entity\EmailBody + cssClass - used to specify an additional CSS class for email body container HTML element +#} +{% macro body(emailBody, cssClass) -%} + {% if emailBody.bodyIsText -%} +{{ emailBody.content }}
+ {%- else -%}
+
+ {%- endif %}
+{%- endmacro %}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php
new file mode 100644
index 00000000000..717505678cd
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Functional/ControllersTest.php
@@ -0,0 +1,56 @@
+client = static::createClient(array(), ToolsAPI::generateBasicHeader());
+ }
+
+ public function testIndex()
+ {
+ $this->client->request('GET', $this->client->generate('oro_email_emailtemplate_index'));
+ $result = $this->client->getResponse();
+ ToolsAPI::assertJsonResponse($result, 200, 'text/html; charset=UTF-8');
+ }
+
+ public function testCreate()
+ {
+ $this->markTestIncomplete('Skipped due to issue with dynamic form loading');
+ $crawler = $this->client->request('GET', $this->client->generate('oro_email_emailtemplate_create'));
+ $dom = new \DOMDocument('1.0', 'UTF-8');
+ $dom->loadHTML($crawler->html());
+ $dom->getElementById('oro_email_emailtemplate');
+ $form = $crawler->filterXPath("//form[@name='oro_email_emailtemplate']");
+
+ $form = $crawler->selectButton('Save and Close')->form();
+ $fields = $form->all();
+ $form['oro_email_emailtemplate[entityName]'] = 'Oro\Bundle\UserBundle\Entity\User';
+ $form['oro_email_emailtemplate[name]'] = 'User Template';
+ $form['oro_email_emailtemplate[translations][defaultLocale][en][content]'] = 'Content template';
+ $form['oro_email_emailtemplate[translations][defaultLocale][en][subject]'] = 'Subject';
+ $form['oro_email_emailtemplate[type]'] = 'html';
+
+ $this->client->followRedirects(true);
+ $crawler = $this->client->submit($form);
+
+ $result = $this->client->getResponse();
+ ToolsAPI::assertJsonResponse($result, 200, '');
+ $this->assertContains("Template sucessfully saved", $crawler->html());
+ }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php
new file mode 100644
index 00000000000..19820c81e52
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBatchProcessorTest.php
@@ -0,0 +1,251 @@
+ownerProvider = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProvider')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->addrManager = new EmailAddressManager(
+ 'Oro\Bundle\EmailBundle\Tests\Unit\Entity\TestFixtures',
+ 'Test%sProxy'
+ );
+ $this->batch = new EmailEntityBatchProcessor($this->addrManager, $this->ownerProvider);
+ }
+
+ public function testAddEmail()
+ {
+ $this->batch->addEmail(new Email());
+ $this->assertCount(1, ReflectionUtil::getProtectedProperty($this->batch, 'emails'));
+ }
+
+ public function testAddAddress()
+ {
+ $this->batch->addAddress($this->addrManager->newEmailAddress()->setEmail('Test@example.com'));
+ $this->assertCount(1, ReflectionUtil::getProtectedProperty($this->batch, 'addresses'));
+
+ $this->assertEquals('Test@example.com', $this->batch->getAddress('TeST@example.com')->getEmail());
+ $this->assertNull($this->batch->getAddress('Another@example.com'));
+
+ $this->setExpectedException('LogicException');
+ $this->batch->addAddress($this->addrManager->newEmailAddress()->setEmail('TEST@example.com'));
+ }
+
+ public function testAddFolder()
+ {
+ $folder = new EmailFolder();
+ $folder->setType('sent');
+ $folder->setName('Test');
+ $this->batch->addFolder($folder);
+ $this->assertCount(1, ReflectionUtil::getProtectedProperty($this->batch, 'folders'));
+
+ $this->assertEquals('Test', $this->batch->getFolder('sent', 'TeST')->getName());
+ $this->assertNull($this->batch->getFolder('sent', 'Another'));
+
+ $folder1 = new EmailFolder();
+ $folder1->setType('trash');
+ $folder1->setName('Test');
+ $this->batch->addFolder($folder1);
+ $this->assertCount(2, ReflectionUtil::getProtectedProperty($this->batch, 'folders'));
+
+ $this->assertEquals('Test', $this->batch->getFolder('trash', 'TeST')->getName());
+ $this->assertNull($this->batch->getFolder('trash', 'Another'));
+
+ $this->setExpectedException('LogicException');
+ $folder2 = new EmailFolder();
+ $folder2->setType('sent');
+ $folder2->setName('TEST');
+ $this->batch->addFolder($folder2);
+ }
+
+ public function testAddOrigin()
+ {
+ $origin = new EmailOrigin();
+ $origin->setName('Test');
+ $this->batch->addOrigin($origin);
+ $this->assertCount(1, ReflectionUtil::getProtectedProperty($this->batch, 'origins'));
+
+ $this->assertEquals('Test', $this->batch->getOrigin('TeST')->getName());
+ $this->assertNull($this->batch->getOrigin('Another'));
+
+ $this->setExpectedException('LogicException');
+ $origin1 = new EmailOrigin();
+ $origin1->setName('TEST');
+ $this->batch->addOrigin($origin1);
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testPersist()
+ {
+ $origin = new EmailOrigin();
+ $origin->setName('Exist');
+ $this->batch->addOrigin($origin);
+ $newOrigin = new EmailOrigin();
+ $newOrigin->setName('New');
+ $this->batch->addOrigin($newOrigin);
+
+ $dbOrigin = new EmailOrigin();
+ $dbOrigin->setName('DbExist');
+
+ $folder = new EmailFolder();
+ $folder->setName('Exist');
+ $folder->setOrigin($origin);
+ $this->batch->addFolder($folder);
+ $newFolder = new EmailFolder();
+ $newFolder->setName('New');
+ $newFolder->setOrigin($newOrigin);
+ $this->batch->addFolder($newFolder);
+
+ $dbFolder = new EmailFolder();
+ $dbFolder->setName('DbExist');
+ $dbFolder->setOrigin($dbOrigin);
+
+ $addr = $this->addrManager->newEmailAddress()->setEmail('Exist');
+ $this->batch->addAddress($addr);
+ $newAddr = $this->addrManager->newEmailAddress()->setEmail('New');
+ $this->batch->addAddress($newAddr);
+
+ $dbAddr = $this->addrManager->newEmailAddress()->setEmail('DbExist');
+
+ $email1 = new Email();
+ $email1->setFolder($folder);
+ $email1->setFromEmailAddress($addr);
+ $email1Recip1 = new EmailRecipient();
+ $email1Recip1->setEmailAddress($addr);
+ $email1Recip2 = new EmailRecipient();
+ $email1Recip2->setEmailAddress($newAddr);
+ $email1->addRecipient($email1Recip1);
+ $email1->addRecipient($email1Recip2);
+ $this->batch->addEmail($email1);
+
+ $email2 = new Email();
+ $email2->setFolder($newFolder);
+ $email2->setFromEmailAddress($newAddr);
+ $email2Recip1 = new EmailRecipient();
+ $email2Recip1->setEmailAddress($addr);
+ $email2Recip2 = new EmailRecipient();
+ $email2Recip2->setEmailAddress($newAddr);
+ $email2->addRecipient($email2Recip1);
+ $email2->addRecipient($email2Recip2);
+ $this->batch->addEmail($email2);
+
+ $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $originRepo = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $folderRepo = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $addrRepo = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $em->expects($this->exactly(3))
+ ->method('getRepository')
+ ->will(
+ $this->returnValueMap(
+ array(
+ array('OroEmailBundle:EmailOrigin', $originRepo),
+ array('OroEmailBundle:EmailFolder', $folderRepo),
+ array('Oro\Bundle\EmailBundle\Tests\Unit\Entity\TestFixtures\TestEmailAddressProxy', $addrRepo),
+ )
+ )
+ );
+
+ $originRepo->expects($this->exactly(2))
+ ->method('findOneBy')
+ ->will(
+ $this->returnCallback(
+ function ($c) use (&$dbOrigin) {
+ return $c['name'] === 'Exist' ? $dbOrigin : null;
+ }
+ )
+ );
+ $folderRepo->expects($this->exactly(2))
+ ->method('findOneBy')
+ ->will(
+ $this->returnCallback(
+ function ($c) use (&$dbFolder) {
+ return $c['name'] === 'Exist' ? $dbFolder : null;
+ }
+ )
+ );
+ $addrRepo->expects($this->exactly(2))
+ ->method('findOneBy')
+ ->will(
+ $this->returnCallback(
+ function ($c) use (&$dbAddr) {
+ return $c['email'] === 'Exist' ? $dbAddr : null;
+ }
+ )
+ );
+
+ $em->expects($this->exactly(5))
+ ->method('persist')
+ ->with(
+ $this->logicalOr(
+ $this->identicalTo($newOrigin),
+ $this->identicalTo($newFolder),
+ $this->identicalTo($newAddr),
+ $this->identicalTo($email1),
+ $this->identicalTo($email2)
+ )
+ );
+
+ $owner = $this->getMock('Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface');
+
+ $this->ownerProvider->expects($this->any())
+ ->method('findEmailOwner')
+ ->will($this->returnValue($owner));
+
+ $this->batch->persist($em);
+
+ $this->assertTrue($dbOrigin === $email1->getFolder()->getOrigin());
+ $this->assertTrue($newOrigin === $email2->getFolder()->getOrigin());
+ $this->assertTrue($dbFolder === $email1->getFolder());
+ $this->assertTrue($newFolder === $email2->getFolder());
+ $this->assertTrue($dbAddr === $email1->getFromEmailAddress());
+ $this->assertNull($email1->getFromEmailAddress()->getOwner());
+ $this->assertTrue($newAddr === $email2->getFromEmailAddress());
+ $this->assertTrue($owner === $email2->getFromEmailAddress()->getOwner());
+ $email1Recipients = $email1->getRecipients();
+ $this->assertTrue($dbAddr === $email1Recipients[0]->getEmailAddress());
+ $this->assertNull($email1Recipients[0]->getEmailAddress()->getOwner());
+ $this->assertTrue($newAddr === $email1Recipients[1]->getEmailAddress());
+ $this->assertTrue($owner === $email1Recipients[1]->getEmailAddress()->getOwner());
+ $email2Recipients = $email2->getRecipients();
+ $this->assertTrue($dbAddr === $email2Recipients[0]->getEmailAddress());
+ $this->assertNull($email2Recipients[0]->getEmailAddress()->getOwner());
+ $this->assertTrue($newAddr === $email2Recipients[1]->getEmailAddress());
+ $this->assertTrue($owner === $email2Recipients[1]->getEmailAddress()->getOwner());
+
+ }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php
new file mode 100644
index 00000000000..a48f05c12e6
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/EmailEntityBuilderTest.php
@@ -0,0 +1,214 @@
+batch = $this->getMockBuilder('Oro\Bundle\EmailBundle\Builder\EmailEntityBatchProcessor')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $addrManager = new EmailAddressManager('Oro\Bundle\EmailBundle\Tests\Unit\Entity\TestFixtures', 'Test%sProxy');
+ $this->builder = new EmailEntityBuilder($this->batch, $addrManager);
+ }
+
+ private function initEmailStorage()
+ {
+ $storage = array();
+ $this->batch->expects($this->any())
+ ->method('getAddress')
+ ->will(
+ $this->returnCallback(
+ function ($email) use (&$storage) {
+ return isset($storage[$email]) ? $storage[$email] : null;
+ }
+ )
+ );
+ $this->batch->expects($this->any())
+ ->method('addAddress')
+ ->will(
+ $this->returnCallback(
+ function ($obj) use (&$storage) {
+ $storage[$obj->getEmail()] = $obj;
+ }
+ )
+ );
+ }
+
+ public function testEmail()
+ {
+ $this->initEmailStorage();
+
+ $date = new \DateTime('now');
+ $email = $this->builder->email(
+ 'testSubject',
+ '"Test" -
{% for val in value %}
- {% if is_entity %}
- {% set items = config_manager.getProvider(val.scope).getConfigContainer().getEntityItems() %}
- {% else %}
- {% set items = config_manager.getProvider(val.scope).getConfigContainer().getFieldItems() %}
- {% endif %}
+ {% set items = config_manager.getProvider(val.scope).getPropertyConfig().getItems(is_entity ? 'entity' : 'type') %}
{% for key, data in val.diff if (is_entity and val.fieldName() == null) or (is_entity == false and val.fieldName() == field_name) %}
{% if items[key]['form']['options']['label'] is defined %}
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/fieldUpdate.html.twig b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/fieldUpdate.html.twig
index 3bd619383c5..04d6b3ece9b 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/fieldUpdate.html.twig
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/fieldUpdate.html.twig
@@ -2,13 +2,12 @@
{% form_theme form with 'OroUIBundle:Form:fields.html.twig' %}
{% set title = 'Update Entity' %}
-{% oro_title_set({params : {"%username%": 'User' }}) %}
-
-{% set formAction = path('oro_entityconfig_field_update', {id: field.id}) %}
+{% oro_title_set({params : {"%entityName%": entity_config.get('label')|default('N/A') }}) %}
{% set entityClass = field.entity.className|replace('\\', '_') %}
{% set audit_title = entity_config.get('label') %}
{% set audit_path = 'oro_entityconfig_audit_field' %}
+{% set audit_entity_id = field.id %}
{% block navButtons %}
{{ UI.button({'path' : path('oro_entityconfig_view', {id: field.entity.id}), 'title' : 'Cancel', 'label' : 'Cancel'}) }}
@@ -22,7 +21,7 @@
'entity' : 'entity',
'indexPath' : path('oro_entityconfig_index'),
'indexLabel' : 'Entities',
- 'entityTitle' : field.id ? field_config.get('label')|default(field.code|capitalize) : 'New Field'|trans,
+ 'entityTitle' : field.id ? field_config.get('label')|default(field.fieldName|capitalize) : 'New Field'|trans,
'additional' : [
{
'indexPath' : path('oro_entityconfig_view', {id: field.entity.id}),
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/propertyLabel.html.twig b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/propertyLabel.html.twig
new file mode 100644
index 00000000000..ed42a1dd7f8
--- /dev/null
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/propertyLabel.html.twig
@@ -0,0 +1,5 @@
+{{ value }}
+{% if record.getValue('icon') is defined %}
+
+{% endif %}
+
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/update.html.twig b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/update.html.twig
index 6489dc833d4..35ac5aeb5e4 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/update.html.twig
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/update.html.twig
@@ -36,8 +36,7 @@
{% set dataBlocks = form_data_blocks(form) %}
{% set data = {
'formErrors': form_errors(form)? form_errors(form) : null,
- 'dataBlocks': dataBlocks,
- 'hiddenData': form_rest(form)
+ 'dataBlocks': dataBlocks
}%}
{{ parent() }}
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/view.html.twig b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/view.html.twig
index 43470774cae..f609cde1a96 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/view.html.twig
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/views/Config/view.html.twig
@@ -58,24 +58,16 @@
{% endfor %}
{% set general_fields = [
- UI.attibuteRow('Icon', entity_config.get('icon')),
+ UI.attibuteRow('Name', entity_name),
+ UI.renderAttribute('Icon', ['
- ">' + + '<% if (tag.get("url").length > 0) { %>' + + '">' + + '<%} %>' + + '<%= tag.get("name") %>' + + '<% if (tag.get("url").length > 0) { %>' + + '' + + '<%} %>' + + ' ' + + '<%}) %>' + + '<% if (models.length == 0) { %>' + + _.__('Not tagged') + + '<%} %>' + + '
(',entity_config.get('icon'),')
\
+ \
+ \
+ \
+
');
+ this.$el.find('[data-select-all]').on('click', _.bind(function (e) {
+ this.collection.trigger('backgrid:selectAll');
+ e.preventDefault();
+ }, this));
+ this.$el.find('[data-select-all-visible]').on('click', _.bind(function (e) {
+ this.collection.trigger('backgrid:selectAllVisible');
+ e.preventDefault();
+ }, this));
+ this.$el.find('[data-select-none]').on('click', _.bind(function (e) {
+ this.collection.trigger('backgrid:selectNone');
+ e.preventDefault();
+ }, this));
+ /* temp solution: end */
+ return this;
+ }
+ });
+
+ return Oro.Datagrid.Cell.SelectAllHeaderCell;
+}));
diff --git a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/cell/selectrowcell.js b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/cell/selectrowcell.js
new file mode 100644
index 00000000000..5ec821ec15c
--- /dev/null
+++ b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/cell/selectrowcell.js
@@ -0,0 +1,100 @@
+/* jshint browser:true */
+(function (factory) {
+ "use strict";
+ /* global define, Oro, jQuery, _, Backbone, Backgrid */
+ if (typeof define === 'function' && define.amd) {
+ define(['Oro', 'jQuery', '_', 'Backbone', 'Backgrid'], factory);
+ } else {
+ factory(Oro, jQuery, _, Backbone, Backgrid);
+ }
+}(function (Oro, $, _, Backbone, Backgrid) {
+ "use strict";
+ Oro.Datagrid = Oro.Datagrid || {};
+ Oro.Datagrid.Cell = Oro.Datagrid.Cell || {};
+
+ /**
+ * Renders a checkbox for row selection.
+ *
+ * @class Oro.Datagrid.Cell.SelectRowCell
+ * @extends Backbone.View
+ */
+ Oro.Datagrid.Cell.SelectRowCell = Backbone.View.extend({
+
+ /** @property */
+ className: "select-row-cell",
+
+ /** @property */
+ tagName: "td",
+
+ /** @property */
+ events: {
+ "change :checkbox": "onChange",
+ "click": "enterEditMode"
+ },
+
+ /**
+ * Initializer. If the underlying model triggers a `select` event, this cell
+ * will change its checked value according to the event's `selected` value.
+ *
+ * @param {Object} options
+ * @param {Backgrid.Column} options.column
+ * @param {Backbone.Model} options.model
+ */
+ initialize: function (options) {
+ //Backgrid.requireOptions(options, ["model", "column"]);
+
+ this.column = options.column;
+ if (!(this.column instanceof Backgrid.Column)) {
+ this.column = new Backgrid.Column(this.column);
+ }
+
+ this.listenTo(this.model, "backgrid:select", function (model, checked) {
+ this.$el.find(":checkbox").prop("checked", checked).change();
+ });
+ },
+
+ /**
+ * Focuses the checkbox.
+ */
+ enterEditMode: function (e) {
+ var $checkbox = this.$el.find(":checkbox").focus();
+ if ($checkbox[0] !== e.target) {
+ $checkbox.prop("checked", !$checkbox.prop("checked")).change();
+ }
+ e.stopPropagation();
+ },
+
+ /**
+ * Unfocuses the checkbox.
+ */
+ exitEditMode: function () {
+ this.$el.find(":checkbox").blur();
+ },
+
+ /**
+ * When the checkbox's value changes, this method will trigger a Backbone
+ * `backgrid:selected` event with a reference of the model and the
+ * checkbox's `checked` value.
+ */
+ onChange: function (e) {
+ this.model.trigger("backgrid:selected", this.model, $(e.target).prop("checked"));
+ },
+
+ /**
+ * Renders a checkbox in a table cell.
+ */
+ render: function () {
+ // work around with trigger event to get current state of model (selected or not)
+ var state = {selected: false};
+ this.$el.empty().append('');
+ this.model.trigger('backgrid:isSelected', this.model, state);
+ if (state.selected) {
+ this.$el.find(':checkbox').prop('checked', 'checked');
+ }
+ this.delegateEvents();
+ return this;
+ }
+ });
+
+ return Oro.Datagrid.Cell.SelectRowCell;
+}));
diff --git a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/filter/list.js b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/filter/list.js
index a93f783e5d0..81f8935c0cd 100644
--- a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/filter/list.js
+++ b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/filter/list.js
@@ -95,6 +95,9 @@ Oro.Datagrid.Filter.List = Oro.Filter.List.extend({
* @return {*}
*/
_applyState: function(state) {
+ var toEnable = [];
+ var toDisable = [];
+
_.each(this.filters, function(filter, name) {
var shortName = '__' + name;
if (_.has(state, name)) {
@@ -104,22 +107,28 @@ Oro.Datagrid.Filter.List = Oro.Filter.List.extend({
value: filterState
}
}
- this.enableFilter(filter.setValue(filterState));
+ filter.setValue(filterState);
+ toEnable.push(filter);
} else if (_.has(state, shortName)) {
+ filter.reset();
if (Number(state[shortName])) {
- this.enableFilter(filter.reset());
+ toEnable.push(filter);
} else {
- this.disableFilter(filter.reset());
+ toDisable.push(filter);
}
} else {
+ filter.reset();
if (filter.defaultEnabled) {
- this.enableFilter(filter.reset());
+ toEnable.push(filter);
} else {
- this.disableFilter(filter.reset());
+ toDisable.push(filter);
}
}
}, this);
+ this.enableFilters(toEnable);
+ this.disableFilters(toDisable);
+
return this;
}
});
diff --git a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/grid.js b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/grid.js
index c24133ec558..19c4bf75df1 100644
--- a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/grid.js
+++ b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/grid.js
@@ -12,13 +12,16 @@ Oro.Datagrid = Oro.Datagrid || {};
* @extends Backgrid.Grid
*/
Oro.Datagrid.Grid = Backgrid.Grid.extend({
- /** @property */
+ /** @property {String} */
+ name: 'datagrid',
+
+ /** @property {String} */
tagName: 'div',
- /** @property */
+ /** @property {int} */
requestsCount: 0,
- /** @property */
+ /** @property {String} */
className: 'clearfix',
/** @property */
@@ -41,7 +44,8 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
grid: '.grid',
toolbar: '.toolbar',
noDataBlock: '.no-data',
- loadingMask: '.loading-mask'
+ loadingMask: '.loading-mask',
+ filterBox: '.filter-box'
},
/** @property {Oro.Datagrid.Header} */
@@ -64,13 +68,15 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
*/
defaults: {
noDataHint: 'No data found.',
+ noResultsHint: 'No items found during search.',
rowClickActionClass: 'row-click-action',
rowClassName: '',
toolbarOptions: {},
addResetAction: true,
addRefreshAction: true,
rowClickAction: undefined,
- rowActions: []
+ rowActions: [],
+ massActions: []
},
/**
@@ -86,6 +92,7 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
* @param {Boolean} [options.addResetAction] If TRUE reset action will be added in toolbar
* @param {Boolean} [options.addRefreshAction] If TRUE refresh action will be added in toolbar
* @param {Oro.Datagrid.Action.AbstractAction[]} [options.rowActions] Array of row actions prototypes
+ * @param {Oro.Datagrid.Action.AbstractAction[]} [options.massActions] Array of mass actions prototypes
* @param {Oro.Datagrid.Action.AbstractAction} [options.rowClickAction] Prototype for action that handles row click
* @throws {TypeError} If mandatory options are undefined
*/
@@ -113,9 +120,10 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
}
options.columns.push(this._createActionsColumn());
+ options.columns.unshift(this._getMassActionsColumn());
this.loadingMask = this._createLoadingMask();
- this.toolbar = this._createToolbar(this.toolbarOptions);
+ this.toolbar = this._createToolbar(_.extend(this.toolbarOptions, options.toolbarOptions));
Backgrid.Grid.prototype.initialize.apply(this, arguments);
@@ -151,10 +159,51 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
*/
_createActionsColumn: function() {
return new this.actionsColumn({
- actions: this.rowActions
+ actions: this.rowActions,
+ datagrid: this
});
},
+ /**
+ * Creates mass actions column
+ *
+ * @return {Backgrid.Column}
+ * @private
+ */
+ _getMassActionsColumn: function() {
+ if (!this.massActionsColumn) {
+ this.massActionsColumn = new Backgrid.Column({
+ name: "massAction",
+ label: _.__("Selected Rows"),
+ renderable: !_.isEmpty(this.massActions),
+ sortable: false,
+ editable: false,
+ cell: Oro.Datagrid.Cell.SelectRowCell,
+ headerCell: Oro.Datagrid.Cell.SelectAllHeaderCell
+ });
+ }
+
+ return this.massActionsColumn;
+ },
+
+ /**
+ * Gets selection state
+ *
+ * @returns {{selectedModels: *, inset: boolean}}
+ */
+ getSelectionState: function() {
+ var selectAllHeader = this.header.row.cells[0];
+ return selectAllHeader.getSelectionState();
+ },
+
+ /**
+ * Resets selection state
+ */
+ resetSelectionState: function() {
+ var selectAllHeader = this.header.row.cells[0];
+ return selectAllHeader.selectNone();
+ },
+
/**
* Creates loading mask
*
@@ -175,7 +224,8 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
_createToolbar: function(toolbarOptions) {
return new this.toolbar(_.extend({}, toolbarOptions, {
collection: this.collection,
- actions: this._getToolbarActions()
+ actions: this._getToolbarActions(),
+ massActions: this._getToolbarMassActions()
}));
},
@@ -196,6 +246,36 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
return result;
},
+ /**
+ * Get mass actions of toolbar
+ *
+ * @return {Array}
+ * @private
+ */
+ _getToolbarMassActions: function() {
+ var result = [];
+ _.each(this.massActions, function(action) {
+ result.push(this.createMassAction(action));
+ }, this);
+
+ return result;
+ },
+
+ /**
+ * Creates action
+ *
+ * @param {Function} actionPrototype
+ * @protected
+ */
+ createMassAction: function(actionPrototype) {
+ return new actionPrototype({
+ datagrid: this,
+ launcherOptions: {
+ className: 'btn'
+ }
+ });
+ },
+
/**
* Get action that refreshes grid's collection
*
@@ -204,7 +284,7 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
getRefreshAction: function() {
if (!this.refreshAction) {
this.refreshAction = new Oro.Datagrid.Action.RefreshCollectionAction({
- collection: this.collection,
+ datagrid: this,
launcherOptions: {
label: 'Refresh',
className: 'btn',
@@ -223,7 +303,7 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
getResetAction: function() {
if (!this.resetAction) {
this.resetAction = new Oro.Datagrid.Action.ResetCollectionAction({
- collection: this.collection,
+ datagrid: this,
launcherOptions: {
label: 'Reset',
className: 'btn',
@@ -277,9 +357,16 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
_runRowClickAction: function(row) {
if (this.rowClickAction) {
var action = new this.rowClickAction({
+ datagrid: this,
model: row.model
});
- action.run();
+ var actionConfiguration = row.model.get('action_configuration');
+ if (_.isUndefined(actionConfiguration)
+ || _.isUndefined(actionConfiguration[action.name])
+ || actionConfiguration[action.name]
+ ) {
+ action.run();
+ }
}
},
@@ -339,8 +426,15 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({
* Render no data block.
*/
renderNoDataBlock: function() {
- this.$(this.selectors.noDataBlock).append($(this.noDataTemplate({
- hint: this.noDataHint.replace('\n', '') + if (_.isEmpty(this.collection.state.filters)) { + // no filters + var dataHint = this.noDataHint; + } else { + // some filters exists + var dataHint = this.noResultsHint; + } + this.$(this.selectors.noDataBlock).html($(this.noDataTemplate({ + hint: dataHint.replace('\n', '
') }))).hide(); this._updateNoDataBlock(); }, @@ -352,8 +446,7 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({ */ _beforeRequest: function() { this.requestsCount++; - this.loadingMask.show(); - this.toolbar.disable(); + this.showLoading(); }, /** @@ -364,9 +457,9 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({ _afterRequest: function() { this.requestsCount--; if (this.requestsCount == 0) { - this.loadingMask.hide(); - this.toolbar.enable(); - this._updateNoDataBlock(); + this.hideLoading(); + // render block instead of update in order to change message depending on filter state + this.renderNoDataBlock(); /** * Backbone event. Fired when data for grid has been successfully rendered. * @event grid_load:complete @@ -375,6 +468,22 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({ } }, + /** + * Show loading mask and disable toolbar + */ + showLoading: function() { + this.loadingMask.show(); + this.toolbar.disable(); + }, + + /** + * Hide loading mask and enable toolbar + */ + hideLoading: function() { + this.loadingMask.hide(); + this.toolbar.enable(); + }, + /** * Update no data block status * @@ -382,10 +491,14 @@ Oro.Datagrid.Grid = Backgrid.Grid.extend({ */ _updateNoDataBlock: function() { if (this.collection.models.length > 0) { + this.$(this.selectors.toolbar).show(); this.$(this.selectors.grid).show(); + this.$(this.selectors.filterBox).show(); this.$(this.selectors.noDataBlock).hide(); } else { this.$(this.selectors.grid).hide(); + this.$(this.selectors.toolbar).hide(); + this.$(this.selectors.filterBox).hide(); this.$(this.selectors.noDataBlock).show(); } }, diff --git a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagesize.js b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagesize.js index 8d051b3718c..db132aa1d3d 100644 --- a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagesize.js +++ b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagesize.js @@ -13,11 +13,12 @@ Oro.Datagrid.PageSize = Backbone.View.extend({ '' + '
' +
'' +
'' +
'
'
@@ -34,6 +35,9 @@ Oro.Datagrid.PageSize = Backbone.View.extend({
/** @property */
enabled: true,
+ /** @property */
+ hidden: false,
+
/**
* Initializer.
*
@@ -56,6 +60,10 @@ Oro.Datagrid.PageSize = Backbone.View.extend({
this.listenTo(this.collection, "add", this.render);
this.listenTo(this.collection, "remove", this.render);
this.listenTo(this.collection, "reset", this.render);
+
+ this.enabled = options.enable != false;
+ this.hidden = options.hide == true;
+
Backbone.View.prototype.initialize.call(this, options);
},
@@ -88,22 +96,44 @@ Oro.Datagrid.PageSize = Backbone.View.extend({
*/
onChangePageSize: function (e) {
e.preventDefault();
- var pageSize = parseInt($(e.target).text());
+ var pageSize = parseInt($(e.target).data('size'));
if (pageSize !== this.collection.state.pageSize) {
- this.collection.state.pageSize = pageSize;
- this.collection.fetch();
+ this.changePageSize(pageSize);
}
},
+ changePageSize: function(pageSize) {
+ this.collection.state.pageSize = pageSize;
+ this.collection.fetch();
+
+ return this;
+ },
+
render: function() {
this.$el.empty();
+ var currentSizeLabel = _.filter(
+ this.items,
+ _.bind(
+ function(item) {
+ return item.size == undefined ? this.collection.state.pageSize == item : this.collection.state.pageSize == item.size;
+ },
+ this
+ )
+ );
+ currentSizeLabel = currentSizeLabel[0].label == undefined ? currentSizeLabel[0] : currentSizeLabel[0].label;
+
this.$el.append($(this.template({
disabled: !this.enabled || !this.collection.state.totalRecords,
collectionState: this.collection.state,
- items: this.items
+ items: this.items,
+ currentSizeLabel: currentSizeLabel
})));
+ if (this.hidden) {
+ this.$el.hide();
+ }
+
return this;
}
});
diff --git a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagination.js b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagination.js
index 57e1000c9a9..440d24c6fc4 100644
--- a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagination.js
+++ b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/pagination.js
@@ -20,6 +20,9 @@ Oro.Datagrid.Pagination = Backbone.View.extend({
/** @property */
enabled: true,
+ /** @property */
+ hidden: false,
+
/** @property */
template: _.template(
'' +
@@ -77,6 +80,9 @@ Oro.Datagrid.Pagination = Backbone.View.extend({
this.listenTo(this.collection, "add", this.render);
this.listenTo(this.collection, "remove", this.render);
this.listenTo(this.collection, "reset", this.render);
+
+ this.hidden = options.hide == true;
+
Backbone.View.prototype.initialize.call(this, options);
},
@@ -204,6 +210,10 @@ Oro.Datagrid.Pagination = Backbone.View.extend({
state: state
})));
+ if (this.hidden) {
+ this.$el.hide();
+ }
+
return this;
}
});
diff --git a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/toolbar.js b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/toolbar.js
index b183eb7285e..03e2c7910d1 100644
--- a/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/toolbar.js
+++ b/src/Oro/Bundle/GridBundle/Resources/public/js/app/datagrid/toolbar.js
@@ -13,6 +13,7 @@ Oro.Datagrid.Toolbar = Backbone.View.extend({
template:_.template(
'' +
'
' +
+ '' +
'
diff --git a/src/Oro/Bundle/SearchBundle/Resources/views/Search/searchResultItem.html.twig b/src/Oro/Bundle/SearchBundle/Resources/views/Search/searchResultItem.html.twig
index d86b8457ac2..2c9c9e49801 100644
--- a/src/Oro/Bundle/SearchBundle/Resources/views/Search/searchResultItem.html.twig
+++ b/src/Oro/Bundle/SearchBundle/Resources/views/Search/searchResultItem.html.twig
@@ -1,19 +1,23 @@
{% import 'OroUserBundle::macros.html.twig' as macros %}
-
- {% if recordUrl is defined %}{% endif %}
-  : asset('bundles/oroui/img/info-usser.png') }})
- {% if recordUrl is defined %}{% endif %}
+ {% if recordUrl is defined -%}
+
+ {%- endif -%}
+  and imagePath ? imagePath|imagine_filter('avatar_med') : asset('bundles/oroui/img/info-' ~ iconType|default('usser') ~ '.png') }})
+ {%- if recordUrl is defined -%}
+
+ {%- endif %}
- {% if recordUrl is defined %}{% endif %}
+ {% if recordUrl is defined -%}
+
+ {%- endif -%}
+
+ {%- if recordUrl is defined -%}
+
+ {%- endif %}
{{ entityType }}
+
- {% if recordUrl is defined %}{% endif %} + {% if recordUrl is defined %}{% endif %} {{ title }} {% if recordUrl is defined %}{% endif %}
diff --git a/src/Oro/Bundle/SearchBundle/Resources/views/Api/results.html.twig b/src/Oro/Bundle/SearchBundle/Resources/views/Search/searchSuggestion.html.twig similarity index 100% rename from src/Oro/Bundle/SearchBundle/Resources/views/Api/results.html.twig rename to src/Oro/Bundle/SearchBundle/Resources/views/Search/searchSuggestion.html.twig diff --git a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestAdvancedSearchApiTest.php b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestAdvancedSearchApiTest.php index c67431d4d8e..f30907398ea 100644 --- a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestAdvancedSearchApiTest.php +++ b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestAdvancedSearchApiTest.php @@ -19,11 +19,7 @@ class RestAdvancedSearchApiTest extends WebTestCase public function setUp() { - if (!isset($this->client)) { - $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); - } else { - $this->client->restart(); - } + $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); if (!self::$hasLoaded) { $this->client->appendFixtures(__DIR__ . DIRECTORY_SEPARATOR . 'DataFixtures'); } @@ -39,7 +35,11 @@ public function setUp() public function testApi($request, $response) { $requestUrl = $request['query']; - $this->client->request('GET', $this->client->generate('oro_api_get_search_advanced'), array('query' => $requestUrl)); + $this->client->request( + 'GET', + $this->client->generate('oro_api_get_search_advanced'), + array('query' => $requestUrl) + ); $result = $this->client->getResponse(); diff --git a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestSearchApiTest.php b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestSearchApiTest.php index d2a19e4b185..ee4f19adae1 100644 --- a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestSearchApiTest.php +++ b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/RestSearchApiTest.php @@ -19,12 +19,7 @@ class RestSearchApiTest extends WebTestCase public function setUp() { - if (!isset($this->client)) { - $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); - } else { - $this->client->restart(); - } - + $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); if (!self::$hasLoaded) { $this->client->appendFixtures(__DIR__ . DIRECTORY_SEPARATOR . 'DataFixtures'); } diff --git a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapAdvancedSearchApiTest.php b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapAdvancedSearchApiTest.php index 67be6d27523..79c6c1c363d 100644 --- a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapAdvancedSearchApiTest.php +++ b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapAdvancedSearchApiTest.php @@ -22,20 +22,14 @@ class SoapAdvancedSearchApiTest extends WebTestCase public function setUp() { - if (!isset($this->client)) { - $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); - - $this->client->soap( - "http://localhost/api/soap", - array( - 'location' => 'http://localhost/api/soap', - 'soap_version' => SOAP_1_2 - ) - ); - - } else { - $this->client->restart(); - } + $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); + $this->client->soap( + "http://localhost/api/soap", + array( + 'location' => 'http://localhost/api/soap', + 'soap_version' => SOAP_1_2 + ) + ); if (!self::$hasLoaded) { $this->client->appendFixtures(__DIR__ . DIRECTORY_SEPARATOR . 'DataFixtures'); @@ -48,7 +42,7 @@ public function setUp() */ public function testApi($request, $response) { - $result = $this->client->soapClient->advancedSearch($request['query']); + $result = $this->client->getSoap()->advancedSearch($request['query']); $result = ToolsAPI::classToArray($result); $this->assertEquals($response['count'], $result['count']); } diff --git a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapSearchApiTest.php b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapSearchApiTest.php index eef082e926c..3243edd81e8 100644 --- a/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapSearchApiTest.php +++ b/src/Oro/Bundle/SearchBundle/Tests/Functional/API/SoapSearchApiTest.php @@ -23,20 +23,15 @@ class SoapSearchApiTest extends WebTestCase public function setUp() { - if (!isset($this->client)) { - $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); + $this->client = static::createClient(array(), ToolsAPI::generateWsseHeader()); - $this->client->soap( - "http://localhost/api/soap", - array( - 'location' => 'http://localhost/api/soap', - 'soap_version' => SOAP_1_2 - ) - ); - - } else { - $this->client->restart(); - } + $this->client->soap( + "http://localhost/api/soap", + array( + 'location' => 'http://localhost/api/soap', + 'soap_version' => SOAP_1_2 + ) + ); if (!self::$hasLoaded) { $this->client->appendFixtures(__DIR__ . DIRECTORY_SEPARATOR . 'DataFixtures'); @@ -44,11 +39,6 @@ public function setUp() self::$hasLoaded = true; } - public static function tearDownAfterClass() - { - Client::rollbackTransaction(); - } - /** * @param string $request * @param array $response @@ -66,7 +56,7 @@ public function testApi($request, $response) if (is_null($request['max_results'])) { $request['max_results'] = self::DEFAULT_VALUE; } - $result = $this->client->soapClient->search( + $result = $this->client->getSoap()->search( $request['search'], $request['offset'], $request['max_results'] diff --git a/src/Oro/Bundle/SearchBundle/Tests/Unit/Datagrid/SearchDatagridBuilderTest.php b/src/Oro/Bundle/SearchBundle/Tests/Unit/Datagrid/SearchDatagridBuilderTest.php index 8ac5fec8851..c3079c3f9df 100644 --- a/src/Oro/Bundle/SearchBundle/Tests/Unit/Datagrid/SearchDatagridBuilderTest.php +++ b/src/Oro/Bundle/SearchBundle/Tests/Unit/Datagrid/SearchDatagridBuilderTest.php @@ -64,6 +64,12 @@ protected function createDatagridBuilder() '', false ); + $aclManager = $this->getMockForAbstractClass( + 'Oro\Bundle\UserBundle\Acl\ManagerInterface', + array(), + '', + false + ); $filterFactory = $this->getMockForAbstractClass( 'Oro\Bundle\GridBundle\Filter\FilterFactoryInterface', array(), @@ -86,6 +92,7 @@ protected function createDatagridBuilder() return new SearchDatagridBuilder( $formFactory, $eventDispatcher, + $aclManager, $filterFactory, $sorterFactory, $actionFactory, diff --git a/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiCrudInterface.php b/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiCrudInterface.php index 5c382100161..3d3d6cc7b88 100644 --- a/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiCrudInterface.php +++ b/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiCrudInterface.php @@ -4,7 +4,7 @@ use Symfony\Component\HttpFoundation\Response; -interface RestApiCrudInterface +interface RestApiCrudInterface extends RestApiReadInterface { /** * Create item. @@ -13,23 +13,6 @@ interface RestApiCrudInterface */ public function handleCreateRequest(); - /** - * Get paginated items list. - * - * @param int $page - * @param int $limit - * @return Response - */ - public function handleGetListRequest($page, $limit); - - /** - * Get item by identifier. - * - * @param mixed $id - * @return mixed - */ - public function handleGetRequest($id); - /** * Update item. * diff --git a/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiReadInterface.php b/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiReadInterface.php new file mode 100644 index 00000000000..dfeaa1c0b35 --- /dev/null +++ b/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestApiReadInterface.php @@ -0,0 +1,25 @@ +getManager(); - $items = $manager->getList($limit, $page); - - $result = array(); - foreach ($items as $item) { - $result[] = $this->getPreparedItem($item); - } - unset($items); - - return new Response(json_encode($result), $result ? Codes::HTTP_OK : Codes::HTTP_NOT_FOUND); - } - - /** - * GET single item - * - * @param mixed $id - * @return Response - */ - public function handleGetRequest($id) - { - $item = $this->getManager()->find($id); - - if ($item) { - $item = $this->getPreparedItem($item); - } - $responseData = $item ? json_encode($item) : ''; - return new Response($responseData, $item ? Codes::HTTP_OK : Codes::HTTP_NOT_FOUND); - } - /** * Edit entity * @@ -122,47 +78,6 @@ public function handleDeleteRequest($id) return $this->handleView($this->view(null, Codes::HTTP_NO_CONTENT)); } - /** - * Prepare entity for serialization - * - * @param mixed $entity - * @return array - */ - protected function getPreparedItem($entity) - { - $result = array(); - /** @var UnitOfWork $uow */ - $uow = $this->getDoctrine()->getManager()->getUnitOfWork(); - foreach ($uow->getOriginalEntityData($entity) as $field => $value) { - $accessors = array('get' . ucfirst($field), 'is' . ucfirst($field), 'has' . ucfirst($field)); - foreach ($accessors as $accessor) { - if (method_exists($entity, $accessor)) { - $value = $entity->$accessor(); - - $this->transformEntityField($field, $value); - $result[$field] = $value; - break; - } - } - } - return $result; - } - - /** - * Prepare entity field for serialization - * - * @param string $field - * @param mixed $value - */ - protected function transformEntityField($field, &$value) - { - if ($value instanceof Proxy && method_exists($value, '__toString')) { - $value = (string)$value; - } elseif ($value instanceof \DateTime) { - $value = $value->format('c'); - } - } - /** * Process form. * diff --git a/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestGetController.php b/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestGetController.php new file mode 100644 index 00000000000..191099a0a71 --- /dev/null +++ b/src/Oro/Bundle/SoapBundle/Controller/Api/Rest/RestGetController.php @@ -0,0 +1,104 @@ +getManager(); + $items = $manager->getList($limit, $page); + + $result = array(); + foreach ($items as $item) { + $result[] = $this->getPreparedItem($item); + } + unset($items); + + return new Response(json_encode($result), $result ? Codes::HTTP_OK : Codes::HTTP_NOT_FOUND); + } + + /** + * GET single item + * + * @param mixed $id + * @return Response + */ + public function handleGetRequest($id) + { + $item = $this->getManager()->find($id); + + if ($item) { + $item = $this->getPreparedItem($item); + } + $responseData = $item ? json_encode($item) : ''; + + return new Response($responseData, $item ? Codes::HTTP_OK : Codes::HTTP_NOT_FOUND); + } + + /** + * Prepare entity for serialization + * + * @param mixed $entity + * @return array + */ + protected function getPreparedItem($entity) + { + if ($entity instanceof Proxy && !$entity->__isInitialized()) { + $entity->__load(); + } + $result = array(); + if ($entity) { + /** @var UnitOfWork $uow */ + $uow = $this->getDoctrine()->getManager()->getUnitOfWork(); + foreach ($uow->getOriginalEntityData($entity) as $field => $value) { + $accessors = array('get' . ucfirst($field), 'is' . ucfirst($field), 'has' . ucfirst($field)); + foreach ($accessors as $accessor) { + if (method_exists($entity, $accessor)) { + $value = $entity->$accessor(); + + $this->transformEntityField($field, $value); + $result[$field] = $value; + break; + } + } + } + } + + return $result; + } + + /** + * Prepare entity field for serialization + * + * @param string $field + * @param mixed $value + */ + protected function transformEntityField($field, &$value) + { + if ($value instanceof Proxy && method_exists($value, '__toString')) { + $value = (string)$value; + } elseif ($value instanceof \DateTime) { + $value = $value->format('c'); + } + } +} diff --git a/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiCrudInterface.php b/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiCrudInterface.php index 38e591ff5bc..5d259211891 100644 --- a/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiCrudInterface.php +++ b/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiCrudInterface.php @@ -2,7 +2,7 @@ namespace Oro\Bundle\SoapBundle\Controller\Api\Soap; -interface SoapApiCrudInterface +interface SoapApiCrudInterface extends SoapApiReadInterface { /** * Create item. @@ -11,23 +11,6 @@ interface SoapApiCrudInterface */ public function handleCreateRequest(); - /** - * Get item by identifier. - * - * @param mixed $id - * @return object - */ - public function handleGetRequest($id); - - /** - * Get paginated items list. - * - * @param int $page - * @param int $limit - * @return \Traversable - */ - public function handleGetListRequest($page, $limit); - /** * Delete item. * diff --git a/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiReadInterface.php b/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiReadInterface.php new file mode 100644 index 00000000000..5a0c75e4991 --- /dev/null +++ b/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapApiReadInterface.php @@ -0,0 +1,23 @@ +getManager()->getList($limit, $page); - } - - /** - * {@inheritDoc} - */ - public function handleGetRequest($id) - { - return $this->getEntity($id); - } - /** * {@inheritDoc} */ @@ -46,7 +27,10 @@ public function handleUpdateRequest($id) */ public function handleCreateRequest() { - return $this->processForm($this->getManager()->createEntity()); + $entity = $this->getManager()->createEntity(); + $this->processForm($entity); + + return $this->getManager()->getEntityId($entity); } /** @@ -63,24 +47,6 @@ public function handleDeleteRequest($id) return true; } - /** - * Get entity by identifier. - * - * @param mixed $id - * @return object - * @throws \SoapFault - */ - protected function getEntity($id) - { - $entity = $this->getManager()->find($id); - - if (!$entity) { - throw new \SoapFault('NOT_FOUND', sprintf('Record #%u can not be found', $id)); - } - - return $entity; - } - /** * Form processing * @@ -133,22 +99,37 @@ protected function fixRequestAttributes($entity) return; } - $data = array(); - foreach ((array)$entityData as $field => $value) { - // special case for ordered arrays - if ($value instanceof \stdClass && isset($value->item) && is_array($value->item)) { - $value = (array) $value->item; - } + $data = $this->convertValueToArray($entityData); - if ($value instanceof Collection) { - $value = $value->toArray(); - } + $request->request->set($this->getForm()->getName(), $data); + } - if (!is_null($value)) { - $data[preg_replace('/[^\w+]+/i', '', $field)] = $value; + protected function convertValueToArray($value) + { + // special case for ordered arrays + if ($value instanceof \stdClass && isset($value->item) && is_array($value->item)) { + $value = (array) $value->item; + } + + if ($value instanceof Collection) { + $value = $value->toArray(); + } + + if (is_object($value)) { + $value = (array)$value; + } + + if (is_array($value)) { + $convertedValue = array(); + foreach ($value as $key => $item) { + $itemValue = $this->convertValueToArray($item); + if (!is_null($itemValue)) { + $convertedValue[preg_replace('/[^\w+]+/i', '', $key)] = $itemValue; + } } + $value = $convertedValue; } - $request->request->set($this->getForm()->getName(), $data); + return $value; } } diff --git a/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapGetController.php b/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapGetController.php new file mode 100644 index 00000000000..fb6a41a6ba9 --- /dev/null +++ b/src/Oro/Bundle/SoapBundle/Controller/Api/Soap/SoapGetController.php @@ -0,0 +1,43 @@ +getManager()->getList($limit, $page); + } + + /** + * {@inheritDoc} + */ + public function handleGetRequest($id) + { + return $this->getEntity($id); + } + + /** + * Get entity by identifier. + * + * @param mixed $id + * @return object + * @throws \SoapFault + */ + protected function getEntity($id) + { + $entity = $this->getManager()->find($id); + + if (!$entity) { + throw new \SoapFault('NOT_FOUND', sprintf('Record #%u can not be found', $id)); + } + + return $entity; + } +} diff --git a/src/Oro/Bundle/SoapBundle/Entity/Manager/ApiEntityManager.php b/src/Oro/Bundle/SoapBundle/Entity/Manager/ApiEntityManager.php index 2953cb8d183..81aa4e95898 100644 --- a/src/Oro/Bundle/SoapBundle/Entity/Manager/ApiEntityManager.php +++ b/src/Oro/Bundle/SoapBundle/Entity/Manager/ApiEntityManager.php @@ -31,10 +31,9 @@ class ApiEntityManager */ public function __construct($class, ObjectManager $om) { - $this->metadata = $om->getClassMetadata($class); - - $this->class = $this->metadata->getName(); $this->om = $om; + $this->metadata = $this->om->getClassMetadata($class); + $this->class = $this->metadata->getName(); } /** @@ -68,6 +67,25 @@ public function find($id) return $this->getRepository()->find($id); } + /** + * @param object $entity + * @return int + * @throws \InvalidArgumentException + */ + public function getEntityId($entity) + { + $className = $this->class; + if (!$entity instanceof $className) { + throw new \InvalidArgumentException('Expected instance of ' . $this->class); + } + + $idFields = $this->metadata->getIdentifierFieldNames(); + $idField = current($idFields); + $entityIds = $this->metadata->getIdentifierValues($entity); + + return $entityIds[$idField]; + } + /** * Return related repository * diff --git a/src/Oro/Bundle/SoapBundle/Tests/Unit/Entity/Manager/ApiEntityManagerTest.php b/src/Oro/Bundle/SoapBundle/Tests/Unit/Entity/Manager/ApiEntityManagerTest.php new file mode 100644 index 00000000000..fb70783f603 --- /dev/null +++ b/src/Oro/Bundle/SoapBundle/Tests/Unit/Entity/Manager/ApiEntityManagerTest.php @@ -0,0 +1,76 @@ +getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata') + ->disableOriginalConstructor() + ->setMethods(array('getName')) + ->getMock(); + } + $metadata->expects($this->any()) + ->method('getName') + ->will($this->returnValue($class)); + + if (!$objectManager) { + $objectManager = $this->getMockBuilder('Doctrine\ORM\EntityManager') + ->disableOriginalConstructor() + ->setMethods(array('getClassMetadata')) + ->getMock(); + } + $objectManager->expects($this->any()) + ->method('getClassMetadata') + ->with($class) + ->will($this->returnValue($metadata)); + + + return new ApiEntityManager($class, $objectManager); + } + + public function testGetEntityId() + { + $className = 'Oro\Bundle\SoapBundle\Tests\Unit\Entity\Manager\Stub\Entity'; + + $entity = new Entity(); + $entity->id = 1; + $entity->name = 'entityName'; + + $metadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata') + ->setConstructorArgs(array($className)) + ->setMethods(array('getIdentifierFieldNames', 'getIdentifierValues')) + ->getMock(); + $metadata->expects($this->once()) + ->method('getIdentifierFieldNames') + ->will($this->returnValue(array('id'))); + $metadata->expects($this->once()) + ->method('getIdentifierValues') + ->with($entity) + ->will($this->returnValue(array('id' => $entity->id))); + + $manager = $this->createApiEntityManager($className, $metadata); + $this->assertEquals($entity->id, $manager->getEntityId($entity)); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage xpected instance of \DateTime + */ + public function testGetEntityIdIncorrectInstance() + { + $manager = $this->createApiEntityManager('\DateTime'); + $manager->getEntityId(new Entity()); + } +} diff --git a/src/Oro/Bundle/SoapBundle/Tests/Unit/Entity/Manager/Stub/Entity.php b/src/Oro/Bundle/SoapBundle/Tests/Unit/Entity/Manager/Stub/Entity.php new file mode 100644 index 00000000000..02557f690cf --- /dev/null +++ b/src/Oro/Bundle/SoapBundle/Tests/Unit/Entity/Manager/Stub/Entity.php @@ -0,0 +1,16 @@ +registry->getManagerForClass($this->className); $this->queryBuilder = $em->getRepository($this->className)->createQueryBuilder($this->alias); - if (!$this->queryBuilder) { - throw new \LogicException('Can\'t create datagrid query. Query builder is not configured.'); - } - return new ResultsQuery($this->queryBuilder, $em, $this->mapper); } } diff --git a/src/Oro/Bundle/TagBundle/Datagrid/TagDatagridManager.php b/src/Oro/Bundle/TagBundle/Datagrid/TagDatagridManager.php index 26a308d9bc3..c335be2c3c2 100644 --- a/src/Oro/Bundle/TagBundle/Datagrid/TagDatagridManager.php +++ b/src/Oro/Bundle/TagBundle/Datagrid/TagDatagridManager.php @@ -30,19 +30,6 @@ protected function getProperties() */ protected function configureFields(FieldDescriptionCollection $fieldsCollection) { - $fieldId = new FieldDescription(); - $fieldId->setName('id'); - $fieldId->setOptions( - array( - 'type' => FieldDescriptionInterface::TYPE_INTEGER, - 'label' => $this->translate('ID'), - 'field_name' => 'id', - 'filter_type' => FilterInterface::TYPE_NUMBER, - 'show_column' => false - ) - ); - $fieldsCollection->add($fieldId); - $fieldName = new FieldDescription(); $fieldName->setName('tag'); $fieldName->setOptions( diff --git a/src/Oro/Bundle/TagBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/TagBundle/DependencyInjection/Configuration.php index 0f7bd79c33f..451c6e96d6e 100644 --- a/src/Oro/Bundle/TagBundle/DependencyInjection/Configuration.php +++ b/src/Oro/Bundle/TagBundle/DependencyInjection/Configuration.php @@ -5,11 +5,6 @@ use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; -/** - * This is the class that validates and merges configuration from your app/config files - * - * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class} - */ class Configuration implements ConfigurationInterface { /** diff --git a/src/Oro/Bundle/TagBundle/Entity/Repository/TagRepository.php b/src/Oro/Bundle/TagBundle/Entity/Repository/TagRepository.php new file mode 100644 index 00000000000..7b4cfc98d7a --- /dev/null +++ b/src/Oro/Bundle/TagBundle/Entity/Repository/TagRepository.php @@ -0,0 +1,66 @@ +createQueryBuilder('t') + ->select('t') + ->innerJoin('t.tagging', 't2', Join::WITH, 't2.recordId = :recordId AND t2.entityName = :entityName') + ->setParameter('recordId', $resource->getTaggableId()) + ->setParameter('entityName', get_class($resource)); + + if (!is_null($createdBy)) { + $qb->where('t2.createdBy ' . ($all ? '!=' : '=') . ' :createdBy') + ->setParameter('createdBy', $createdBy); + } + + return $qb->getQuery()->getResult(); + } + + /** + * Remove tagging related to tags by params + * + * @param array|int $tagIds + * @param string $entityName + * @param int $recordId + * @param null|int $createdBy + * @return array + */ + public function deleteTaggingByParams($tagIds, $entityName, $recordId, $createdBy = null) + { + $builder = $this->_em->createQueryBuilder(); + $builder + ->delete('OroTagBundle:Tagging', 't') + ->where('t.entityName = :entityName') + ->setParameter('entityName', $entityName) + ->andWhere('t.recordId = :recordId') + ->setParameter('recordId', $recordId); + + if (!empty($tagIds)) { + $builder->andWhere($builder->expr()->in('t.tag', $tagIds)); + } + + if (!is_null($createdBy)) { + $builder->andWhere('t.createdBy = :createdBy') + ->setParameter('createdBy', $createdBy); + } + + return $builder->getQuery()->getResult(); + } +} diff --git a/src/Oro/Bundle/TagBundle/Entity/Tag.php b/src/Oro/Bundle/TagBundle/Entity/Tag.php index b63f56eba45..b0aef41ce53 100644 --- a/src/Oro/Bundle/TagBundle/Entity/Tag.php +++ b/src/Oro/Bundle/TagBundle/Entity/Tag.php @@ -4,15 +4,23 @@ use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\PersistentCollection; +use Doctrine\Common\Collections\ArrayCollection; use Oro\Bundle\UserBundle\Entity\User; +use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; /** * Tag * * @ORM\Table(name="oro_tag_tag") * @ORM\HasLifecycleCallbacks - * @ORM\Entity + * @ORM\Entity(repositoryClass="Oro\Bundle\TagBundle\Entity\Repository\TagRepository") + * @Config( + * defaultValues={ + * "entity"={"label"="Tag", "plural_label"="Tags"}, + * "ownership"={"owner_type"="USER"} + * } + * ) */ class Tag implements ContainAuthorInterface, ContainUpdaterInterface { @@ -46,7 +54,7 @@ class Tag implements ContainAuthorInterface, ContainUpdaterInterface protected $updated; /** - * @ORM\OneToMany(targetEntity="Tagging", mappedBy="tag", fetch="EAGER") + * @ORM\OneToMany(targetEntity="Tagging", mappedBy="tag", fetch="LAZY") */ protected $tagging; @@ -64,6 +72,13 @@ class Tag implements ContainAuthorInterface, ContainUpdaterInterface */ protected $updatedBy; + /** + * @var User + * @ORM\ManyToOne(targetEntity="Oro\Bundle\UserBundle\Entity\User") + * @ORM\JoinColumn(name="user_owner_id", referencedColumnName="id", onDelete="SET NULL") + */ + protected $owner; + /** * Constructor * @@ -72,6 +87,7 @@ class Tag implements ContainAuthorInterface, ContainUpdaterInterface public function __construct($name = null) { $this->setName($name); + $this->tagging = new ArrayCollection(); $this->setCreatedAt(new \DateTime('now', new \DateTimeZone('UTC'))); $this->setUpdatedAt(new \DateTime('now', new \DateTimeZone('UTC'))); @@ -220,4 +236,23 @@ public function doUpdate() { $this->updated = new \DateTime('now', new \DateTimeZone('UTC')); } + + /** + * @return User + */ + public function getOwner() + { + return $this->owner; + } + + /** + * @param User $owningUser + * @return Tag + */ + public function setOwner($owningUser) + { + $this->owner = $owningUser; + + return $this; + } } diff --git a/src/Oro/Bundle/TagBundle/Entity/TagManager.php b/src/Oro/Bundle/TagBundle/Entity/TagManager.php index b77abd4d4f9..4f453f8f66a 100644 --- a/src/Oro/Bundle/TagBundle/Entity/TagManager.php +++ b/src/Oro/Bundle/TagBundle/Entity/TagManager.php @@ -2,17 +2,23 @@ namespace Oro\Bundle\TagBundle\Entity; -use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\Query\Expr; +use Doctrine\ORM\EntityManager; +use Doctrine\Common\Collections\ArrayCollection; -use Oro\Bundle\SearchBundle\Engine\ObjectMapper; -use Symfony\Component\Security\Core\SecurityContext; +use Symfony\Bundle\FrameworkBundle\Routing\Router; use Symfony\Component\Security\Core\SecurityContextInterface; +use Oro\Bundle\UserBundle\Acl\Manager; +use Oro\Bundle\UserBundle\Entity\User; +use Oro\Bundle\SearchBundle\Engine\ObjectMapper; +use Oro\Bundle\TagBundle\Entity\Repository\TagRepository; + class TagManager { + const ACL_RESOURCE_REMOVE_ID_KEY = 'oro_tag_unassign_global'; + const ACL_RESOURCE_CREATE_ID_KEY = 'oro_tag_create'; + const ACL_RESOURCE_ASSIGN_ID_KEY = 'oro_tag_assign_unassign'; /** * @var EntityManager */ @@ -38,25 +44,33 @@ class TagManager */ protected $securityContext; - public function __construct(EntityManager $em, $tagClass, $taggingClass, ObjectMapper $mapper, SecurityContextInterface $securityContext) - { + /** + * @var Manager + */ + protected $aclManager; + + /** + * @var Router + */ + protected $router; + + public function __construct( + EntityManager $em, + $tagClass, + $taggingClass, + ObjectMapper $mapper, + SecurityContextInterface $securityContext, + Manager $aclManager, + Router $router + ) { $this->em = $em; $this->tagClass = $tagClass; $this->taggingClass = $taggingClass; $this->mapper = $mapper; $this->securityContext = $securityContext; - } - - /** - * Adds a tag on the given taggable resource - * - * @param Tag $tag Tag object - * @param Taggable $resource Taggable resource - */ - public function addTag(Tag $tag, Taggable $resource) - { - $resource->getTags()->add($tag); + $this->aclManager = $aclManager; + $this->router = $router; } /** @@ -65,40 +79,15 @@ public function addTag(Tag $tag, Taggable $resource) * @param Tag[] $tags Array of Tag objects * @param Taggable $resource Taggable resource */ - public function addTags(array $tags, Taggable $resource) + public function addTags($tags, Taggable $resource) { foreach ($tags as $tag) { if ($tag instanceof Tag) { - $this->addTag($tag, $resource); + $resource->getTags()->add($tag); } } } - /** - * Removes an existant tag on the given taggable resource - * - * @param Tag $tag Tag object - * @param Taggable $resource Taggable resource - * @return Boolean - */ - public function removeTag(Tag $tag, Taggable $resource) - { - return $resource->getTags()->removeElement($tag); - } - - /** - * Replaces all current tags on the given taggable resource - * - * @param Tag[] $tags Array of Tag objects - * @param Taggable $resource Taggable resource - */ - public function replaceTags(array $tags, Taggable $resource) - { - $resource->setTags(new ArrayCollection()); - - $this->addTags($tags, $resource); - } - /** * Loads or creates multiples tags from a list of tag names * @@ -111,20 +100,17 @@ public function loadOrCreateTags(array $names) return array(); } + array_walk( + $names, + function (&$item) { + $item = trim($item); + } + ); $names = array_unique($names); - - $builder = $this->em->createQueryBuilder(); - - $tags = $builder - ->select('t') - ->from($this->tagClass, 't') - - ->where($builder->expr()->in('t.name', $names)) - - ->getQuery() - ->getResult(); + $tags = $this->em->getRepository($this->tagClass)->findBy(array('name' => $names)); $loadedNames = array(); + /** @var Tag $tag */ foreach ($tags as $tag) { $loadedNames[] = $tag->getName(); } @@ -133,138 +119,208 @@ public function loadOrCreateTags(array $names) if (sizeof($missingNames)) { foreach ($missingNames as $name) { $tag = $this->createTag($name); - $this->em->persist($tag); $tags[] = $tag; } - - $this->em->flush(); } return $tags; } /** - * Saves tags for the given taggable resource + * Prepare array * - * @param Taggable $resource Taggable resource + * @param Taggable $entity + * @param ArrayCollection|null $tags + * @return array */ - public function saveTagging(Taggable $resource) + public function getPreparedArray(Taggable $entity, $tags = null) { - $oldTags = $this->getTagging($resource); - $newTags = $resource->getTags(); - - if (!isset($newTags['all'], $newTags['owner'])) { - return; + if (is_null($tags)) { + $this->loadTagging($entity); + $tags = $entity->getTags(); } + $result = array(); + + /** @var Tag $tag */ + foreach ($tags as $tag) { + $entry = array( + 'name' => $tag->getName() + ); + if (!$tag->getId()) { + $entry = array_merge( + $entry, + array( + 'id' => $tag->getName(), + 'url' => false, + 'owner' => true + ) + ); + } else { + $entry = array_merge( + $entry, + array( + 'id' => $tag->getId(), + 'url' => $this->router->generate('oro_tag_search', array('id' => $tag->getId())), + 'owner' => false + ) + ); + } - $tagsToAdd = new ArrayCollection($newTags['owner']); + $taggingCollection = $tag->getTagging()->filter( + function (Tagging $tagging) use ($entity) { + // only use tagging entities that related to current entity + return $tagging->getEntityName() == get_class($entity) + && $tagging->getRecordId() == $entity->getTaggableId(); + } + ); - if ($oldTags !== null and is_array($oldTags) and !empty($oldTags)) { - $tagsToRemove = array(); + /** @var Tagging $tagging */ + foreach ($taggingCollection as $tagging) { + if ($this->getUser()->getId() == $tagging->getCreatedBy()->getId()) { + $entry['owner'] = true; + } + } + + $entry['moreOwners'] = $taggingCollection->count() > 1; - foreach ($oldTags as $oldTag) { - $callback = function ($index, $newTag) use ($oldTag) { - return $newTag->getName() == $oldTag->getName(); - }; + $result[] = $entry; + } - if ($tagsToAdd->exists($callback)) { - $tagsToAdd->removeElement($oldTag); - } else { - $tagsToRemove[] = $oldTag->getId(); + return $result; + } + + /** + * Saves tags for the given taggable resource + * + * @param Taggable $resource Taggable resource + */ + public function saveTagging(Taggable $resource) + { + $oldTags = $this->getTagging($resource, $this->getUser()->getId()); + $newTags = $resource->getTags(); + if (isset($newTags['all'], $newTags['owner'])) { + $newOwnerTags = new ArrayCollection($newTags['owner']); + $newAllTags = new ArrayCollection($newTags['all']); + + $manager = $this; + $tagsToAdd = $newOwnerTags->filter( + function ($tag) use ($oldTags, $manager) { + return !$oldTags->exists($manager->compareCallback($tag)); } + ); + $tagsToDelete = $oldTags->filter( + function ($tag) use ($newOwnerTags, $manager) { + return !$newOwnerTags->exists($manager->compareCallback($tag)); + } + ); + + if (!$tagsToDelete->isEmpty() + && $this->aclManager->isResourceGranted(self::ACL_RESOURCE_ASSIGN_ID_KEY) + ) { + $this->deleteTaggingByParams( + $tagsToDelete, + get_class($resource), + $resource->getTaggableId(), + $this->getUser()->getId() + ); } - if (sizeof($tagsToRemove)) { - $builder = $this->em->createQueryBuilder(); - $builder - ->delete($this->taggingClass, 't') - ->where($builder->expr()->in('t.tag', $tagsToRemove)) - ->andWhere('t.entityName = :entityName') - ->setParameter('entityName', get_class($resource)) - ->andWhere('t.recordId = :recordId') - ->setParameter('recordId', $resource->getTaggableId()) - ->getQuery() - ->getResult(); + // process if current user allowed to remove other's tag links + if ($this->aclManager->isResourceGranted(self::ACL_RESOURCE_REMOVE_ID_KEY)) { + // get 'not mine' taggings + $oldTags = $this->getTagging($resource, $this->getUser()->getId(), true); + $tagsToDelete = $oldTags->filter( + function ($tag) use ($newAllTags, $manager) { + return !$newAllTags->exists($manager->compareCallback($tag)); + } + ); + if (!$tagsToDelete->isEmpty()) { + $this->deleteTaggingByParams( + $tagsToDelete, + get_class($resource), + $resource->getTaggableId() + ); + } } - } - foreach ($tagsToAdd as $tag) { - $this->em->persist($tag); + foreach ($tagsToAdd as $tag) { + if (!$this->aclManager->isResourceGranted(self::ACL_RESOURCE_ASSIGN_ID_KEY) + || (!$this->aclManager->isResourceGranted(self::ACL_RESOURCE_CREATE_ID_KEY) && !$tag->getId()) + ) { + // skip tags that have not ID because user not granted to create tags + continue; + } - $alias = $this->mapper->getEntityConfig(get_class($resource)); + $this->em->persist($tag); - $tagging = $this->createTagging($tag, $resource) - ->setAlias($alias['alias']); + $alias = $this->mapper->getEntityConfig(get_class($resource)); - $this->em->persist($tagging); - } + $tagging = $this->createTagging($tag, $resource) + ->setAlias($alias['alias']); + + $this->em->persist($tagging); + } - if (count($tagsToAdd)) { - $this->em->flush(); + if (!$tagsToAdd->isEmpty()) { + $this->em->flush(); + } } } /** - * Loads all tags for the given taggable resource - * - * @param Taggable $resource Taggable resource + * @param Tag $tag + * @return callable */ - public function loadTagging(Taggable $resource) + public function compareCallback($tag) { - $tags = $this->getTagging($resource); - $this->replaceTags($tags, $resource); + return function ($index, $item) use ($tag) { + /** @var Tag $item */ + return $item->getName() == $tag->getName(); + }; } /** - * Gets all tags for the given taggable resource + * Loads all tags for the given taggable resource * - * @param Taggable $resource Taggable resource - * @return array + * @param Taggable $resource Taggable resource + * @return $this */ - protected function getTagging(Taggable $resource) + public function loadTagging(Taggable $resource) { - $query = $this->em - ->createQueryBuilder() - - ->select('t') - ->from($this->tagClass, 't') - - ->innerJoin('t.tagging', 't2', Join::WITH, 't2.recordId = :recordId AND t2.entityName = :entityName') - ->setParameter('recordId', $resource->getTaggableId()) - ->setParameter('entityName', get_class($resource)) - ->getQuery(); + $tags = $this->getTagging($resource); + $this->addTags($tags, $resource); - return $query->getResult(); + return $this; } /** - * Deletes all tagging records for the given taggable resource + * Remove tagging related to tags by params * - * @param Taggable $resource - * @return $this + * @param array|ArrayCollection|int $tagIds + * @param string $entityName + * @param int $recordId + * @param null|int $createdBy + * @return array */ - public function deleteTagging(Taggable $resource) + public function deleteTaggingByParams($tagIds, $entityName, $recordId, $createdBy = null) { - $taggingList = $this->em->createQueryBuilder() - ->select('t') - ->from($this->taggingClass, 't') - - ->where('t.entityName = :entityName') - ->setParameter('entityName', get_class($resource)) - - ->andWhere('t.recordId = :id') - ->setParameter('id', $resource->getTaggableId()) - - ->getQuery() - ->getResult(); - - foreach ($taggingList as $tagging) { - $this->em->remove($tagging); - $this->em->flush($tagging); + /** @var TagRepository $repository */ + $repository = $this->em->getRepository($this->tagClass); + + if (!$tagIds) { + $tagIds = array(); + } elseif ($tagIds instanceof ArrayCollection) { + $tagIds = array_map( + function ($item) { + /** @var Tag $item */ + return $item->getId(); + }, + $tagIds->toArray() + ); } - return $this; + return $repository->deleteTaggingByParams($tagIds, $entityName, $recordId, $createdBy); } /** @@ -273,7 +329,7 @@ public function deleteTagging(Taggable $resource) * @param string $name Tag name * @return Tag */ - protected function createTag($name) + private function createTag($name) { return new $this->tagClass($name); } @@ -285,8 +341,34 @@ protected function createTag($name) * @param Taggable $resource Taggable resource object * @return Tagging */ - protected function createTagging(Tag $tag, Taggable $resource) + private function createTagging(Tag $tag, Taggable $resource) { return new $this->taggingClass($tag, $resource); } + + /** + * Gets all tags for the given taggable resource + * + * @param Taggable $resource Taggable resource + * @param null|int $createdBy + * @param bool $all + * @return ArrayCollection + */ + private function getTagging(Taggable $resource, $createdBy = null, $all = false) + { + /** @var TagRepository $repository */ + $repository = $this->em->getRepository($this->tagClass); + + return new ArrayCollection($repository->getTagging($resource, $createdBy, $all)); + } + + /** + * Return current user + * + * @return User + */ + private function getUser() + { + return $this->securityContext->getToken()->getUser(); + } } diff --git a/src/Oro/Bundle/TagBundle/Entity/Tagging.php b/src/Oro/Bundle/TagBundle/Entity/Tagging.php index 488feda7850..4e03677cf09 100644 --- a/src/Oro/Bundle/TagBundle/Entity/Tagging.php +++ b/src/Oro/Bundle/TagBundle/Entity/Tagging.php @@ -9,7 +9,9 @@ /** * @ORM\Table( * name="oro_tag_tagging", - * uniqueConstraints={@ORM\UniqueConstraint(name="tagging_idx", columns={"tag_id", "entity_name", "record_id", "created_by"})} + * uniqueConstraints={ + * @ORM\UniqueConstraint(name="tagging_idx", columns={"tag_id", "entity_name", "record_id", "created_by"}) + * } * ) * @ORM\Entity */ @@ -25,7 +27,7 @@ class Tagging implements ContainAuthorInterface protected $id; /** - * @ORM\ManyToOne(targetEntity="Tag", inversedBy="tagging") + * @ORM\ManyToOne(targetEntity="Tag", inversedBy="tagging", cascade="ALL") * @ORM\JoinColumn(name="tag_id", referencedColumnName="id", onDelete="CASCADE") **/ protected $tag; diff --git a/src/Oro/Bundle/TagBundle/EventListener/TagListener.php b/src/Oro/Bundle/TagBundle/EventListener/TagListener.php index 3c3cd621955..be71da55681 100644 --- a/src/Oro/Bundle/TagBundle/EventListener/TagListener.php +++ b/src/Oro/Bundle/TagBundle/EventListener/TagListener.php @@ -31,7 +31,11 @@ public function preRemove(LifecycleEventArgs $args) } if (($resource = $args->getEntity()) and $resource instanceof Taggable) { - $this->manager->deleteTagging($resource); + $this->manager->deleteTaggingByParams( + null, + get_class($resource), + $resource->getTaggableId() + ); } } diff --git a/src/Oro/Bundle/TagBundle/Form/EventSubscriber/TagSubscriber.php b/src/Oro/Bundle/TagBundle/Form/EventSubscriber/TagSubscriber.php new file mode 100644 index 00000000000..59ec7eb6309 --- /dev/null +++ b/src/Oro/Bundle/TagBundle/Form/EventSubscriber/TagSubscriber.php @@ -0,0 +1,119 @@ +manager = $manager; + $this->transformer = $transformer; + } + + /** + * {@inheritdoc} + */ + public static function getSubscribedEvents() + { + return array( + FormEvents::PRE_SET_DATA => 'preSet', + FormEvents::PRE_SUBMIT => 'preSubmit' + ); + } + + /** + * Loads tagging and transform it to view data + * + * @param FormEvent $event + */ + public function preSet(FormEvent $event) + { + $entity = $event->getForm()->getParent()->getData(); + + if (!$entity instanceof Taggable) { + // do nothing if new entity or some error + return; + } + + $tags = $this->manager->getPreparedArray($entity); + $ownTags = array_filter( + $tags, + function ($item) { + return isset($item['owner']) && $item['owner']; + } + ); + + // pass entity to transformer + $this->transformer->setEntity($entity); + + $event->setData( + array( + 'autocomplete' => null, + 'all' => json_encode($tags), + 'owner' => json_encode($ownTags) + ) + ); + } + + /** + * Transform submitted data to model data + * + * @param FormEvent $event + */ + public function preSubmit(FormEvent $event) + { + $values = $event->getData(); + $entities = array( + 'all' => array(), + 'owner' => array() + ); + + foreach (array_keys($entities) as $type) { + if (isset($values[$type]) && !empty($values[$type])) { + try { + if (!is_array($values[$type])) { + $values[$type] = json_decode($values[$type]); + } + $names[$type] = array(); + foreach ($values[$type] as $value) { + if (!empty($value->name)) { + // new tag + $names[$type][] = $value->name; + } + } + + $entities[$type] = $this->manager->loadOrCreateTags($names[$type]); + } catch (\Exception $e) { + $entities[$type] = array(); + } + } + } + + $event->setData($entities); + } +} diff --git a/src/Oro/Bundle/TagBundle/Form/TagsTransformer.php b/src/Oro/Bundle/TagBundle/Form/TagsTransformer.php deleted file mode 100644 index 05aeb60e5ce..00000000000 --- a/src/Oro/Bundle/TagBundle/Form/TagsTransformer.php +++ /dev/null @@ -1,106 +0,0 @@ - array(), - 'owner' => array() - ); - - if (!isset($values['all'], $values['owner'])) { - return $values; - } - - foreach (array_keys($entities) as $type) { - if (!is_array($values[$type])) { - $values[$type] = explode(',', $values[$type]); - } - - $newValues[$type] = array_filter( - $values[$type], - function ($item) { - return !intval($item) && !empty($item); - } - ); - - $values[$type] = array_filter( - $values[$type], - function ($item) { - return intval($item); - } - ); - - if ($values[$type]) { - $entities[$type] = $this->loadEntitiesByIds($values[$type]); - } - - if ($newValues[$type]) { - $entities[$type] = array_merge($entities[$type], $this->tagManager->loadOrCreateTags($newValues[$type])); - } - - if (count($entities[$type]) !== count($values[$type]) + count($newValues[$type])) { - throw new TransformationFailedException('Could not find all entities for the given IDs'); - } - } - - return $entities; - } - - /** - * Load entities by array of ids - * - * @param array $ids - * @return array - * @throws UnexpectedTypeException if query builder callback returns invalid type - */ - protected function loadEntitiesByIds(array $ids) - { - $repository = $this->em->getRepository($this->className); - if ($this->queryBuilderCallback) { - /** @var $qb QueryBuilder */ - $qb = call_user_func($this->queryBuilderCallback, $repository, $ids); - if (!$qb instanceof QueryBuilder) { - throw new UnexpectedTypeException($qb, 'Doctrine\ORM\QueryBuilder'); - } - } else { - $qb = $repository->createQueryBuilder('e'); - $qb->where(sprintf('e.%s IN (:ids)', $this->propertyPath)) - ->setParameter('ids', $ids); - } - - return $qb->getQuery()->execute(); - } - - public function setTagManager(TagManager $tagManager) - { - $this->tagManager = $tagManager; - } -} diff --git a/src/Oro/Bundle/TagBundle/Form/Transformer/TagTransformer.php b/src/Oro/Bundle/TagBundle/Form/Transformer/TagTransformer.php new file mode 100644 index 00000000000..d7526234df3 --- /dev/null +++ b/src/Oro/Bundle/TagBundle/Form/Transformer/TagTransformer.php @@ -0,0 +1,64 @@ +manager = $manager; + } + + /** + * {@inheritdoc} + */ + public function reverseTransform($value) + { + return $value; + } + + /** + * {@inheritdoc} + */ + public function transform($value) + { + // transform to JSON if we have array of entities + // needed to correct rendering form if validation not passed + if (is_array($value)) { + $result = array(); + if ($this->entity) { + $result = $this->manager->getPreparedArray($this->entity, new ArrayCollection($value)); + } + $value = json_encode($result); + } + + return $value; + } + + /** + * Setter for entity object + * + * @param Taggable $entity + */ + public function setEntity(Taggable $entity) + { + $this->entity = $entity; + } +} diff --git a/src/Oro/Bundle/TagBundle/Form/Type/TagAutocompleteType.php b/src/Oro/Bundle/TagBundle/Form/Type/TagAutocompleteType.php new file mode 100644 index 00000000000..9b3f7e41627 --- /dev/null +++ b/src/Oro/Bundle/TagBundle/Form/Type/TagAutocompleteType.php @@ -0,0 +1,43 @@ +setDefaults( + array( + 'configs' => array( + 'placeholder' => 'oro.tag.form.choose_or_create_tag', + 'extra_config' => 'multi_autocomplete', + 'multiple' => true + ), + 'autocomplete_alias' => 'tags', + ) + ); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'oro_tag_autocomplete'; + } + + /** + * {@inheritdoc} + */ + public function getParent() + { + return 'oro_jqueryselect2_hidden'; + } +} diff --git a/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php b/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php index 0dbd89fa241..0c5ced90ada 100644 --- a/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php +++ b/src/Oro/Bundle/TagBundle/Form/Type/TagSelectType.php @@ -1,49 +1,39 @@ om = $om; - $this->tagManager = $tagManager; + $this->subscriber = $subscriber; + $this->transformer = $transformer; } + /** + * {@inheritdoc} + */ public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults( array( - 'configs' => array( - 'placeholder' => 'oro.tag.form.choose_tag', - 'multiple' => true, - 'tokenSeparators' => array(',', ' '), - 'tags' => true, - 'extra_config' => 'multi_autocomplete', - ), - 'autocomplete_alias' => 'tags', + 'required' => false, ) ); } @@ -53,15 +43,26 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $transformer = new TagsTransformer($this->om, 'Oro\Bundle\TagBundle\Entity\Tag'); - $transformer->setTagManager($this->tagManager); + $builder->addEventSubscriber($this->subscriber); - $builder->addModelTransformer($transformer); - } + $builder->add( + 'autocomplete', + 'oro_tag_autocomplete' + ); - public function getParent() - { - return 'oro_jqueryselect2_hidden'; + $builder->add( + $builder->create( + 'all', + 'hidden' + )->addViewTransformer($this->transformer) + ); + + $builder->add( + $builder->create( + 'owner', + 'hidden' + )->addViewTransformer($this->transformer) + ); } /** diff --git a/src/Oro/Bundle/TagBundle/Resources/config/assets.yml b/src/Oro/Bundle/TagBundle/Resources/config/assets.yml index 9f352b28ea9..601a3786e7a 100644 --- a/src/Oro/Bundle/TagBundle/Resources/config/assets.yml +++ b/src/Oro/Bundle/TagBundle/Resources/config/assets.yml @@ -6,5 +6,5 @@ js: 'tags': - '@OroTagBundle/Resources/public/js/models/tag.js' - '@OroTagBundle/Resources/public/js/views/tag.js' + - '@OroTagBundle/Resources/public/js/views/tag_update.js' - '@OroTagBundle/Resources/public/js/collections/tag.js' - - '@OroTagBundle/Resources/public/js/views/select2.js' diff --git a/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml index fad33ad2e87..cd1cbb23d2b 100644 --- a/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml +++ b/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml @@ -11,7 +11,7 @@ services: - name: oro_grid.datagrid.manager datagrid_name: tags entity_name: %oro_tag.tag.entity.class% - entity_hint: tags + entity_hint: tag route_name: oro_tag_index oro_tag.datagrid_results.datagrid_manager: @@ -20,7 +20,7 @@ services: tags: - name: oro_grid.datagrid.manager datagrid_name: %oro_tag.datagrid_results.grid_name% - entity_hint: results + entity_hint: result query_factory: oro_tag.datagrid_results.query_factory route_name: oro_tag_search_ajax diff --git a/src/Oro/Bundle/TagBundle/Resources/config/services.yml b/src/Oro/Bundle/TagBundle/Resources/config/services.yml index 4e912b5fa35..27beaa4f7f3 100644 --- a/src/Oro/Bundle/TagBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/TagBundle/Resources/config/services.yml @@ -13,6 +13,9 @@ parameters: oro_tag.autocomplete.tag.search_handler.class: Oro\Bundle\FormBundle\Autocomplete\SearchHandler oro_tag.form.type.tag_select.class: Oro\Bundle\TagBundle\Form\Type\TagSelectType + oro_tag.form.type.tag_autocomplete.class: Oro\Bundle\TagBundle\Form\Type\TagAutocompleteType + oro_tag.form.subscriber.tag_select.class: Oro\Bundle\TagBundle\Form\EventSubscriber\TagSubscriber + oro_tag.form.transformer.tag_select.class: Oro\Bundle\TagBundle\Form\Transformer\TagTransformer oro_tag.provider.search_provider.class: Oro\Bundle\TagBundle\Provider\SearchProvider @@ -27,6 +30,8 @@ services: - %oro_tag.tagging.entity.class% - @oro_search.mapper - @security.context + - @oro_user.acl_manager + - @router oro_tag.docrine.event.listener: class: %oro_tag.tag_listener.class% @@ -105,21 +110,33 @@ services: - { name: oro_form.autocomplete.search_handler, alias: tags, acl_resource: oro_tag_assign_unassign } # Autocomplete form type + oro_tag.form.type.tag_autocomplete: + class: %oro_tag.form.type.tag_autocomplete.class% + tags: + - { name: form.type, alias: oro_tag_autocomplete } + oro_tag.form.type.tag_select: class: %oro_tag.form.type.tag_select.class% arguments: - - @doctrine.orm.entity_manager - - @oro_tag.tag.manager + - @oro_tag.form.subscriber.tag_select + - @oro_tag.form.transformer.tag_select tags: - { name: form.type, alias: oro_tag_select } + oro_tag.form.subscriber.tag_select: + class: %oro_tag.form.subscriber.tag_select.class% + arguments: + - @oro_tag.tag.manager + - @oro_tag.form.transformer.tag_select + + oro_tag.form.transformer.tag_select: + class: %oro_tag.form.transformer.tag_select.class% + arguments: [@oro_tag.tag.manager] + # Twig extension oro_tag.twig.tag.extension: class: %oro_tag.twig.tag.extension.class% arguments: - @oro_tag.tag.manager - - @router - - @security.context - - @oro_user.acl_manager tags: - { name: twig.extension } diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/tag.css b/src/Oro/Bundle/TagBundle/Resources/public/css/tag.css index f92f77723f3..68cf2ee6cfe 100644 --- a/src/Oro/Bundle/TagBundle/Resources/public/css/tag.css +++ b/src/Oro/Bundle/TagBundle/Resources/public/css/tag.css @@ -1,7 +1,8 @@ +#tags-overlay #tag-list, .tag-view #tag-list { margin-bottom: 0; } -.tag-view #tag-sort-actions { +#tag-sort-actions { margin-top: 5px; } #tag-sort-actions a.active:hover, @@ -10,15 +11,20 @@ text-decoration: none; color: #777777; } +#tags-overlay #tag-list span.label.with-button { + position: relative; + padding-right: 17px; +} .select2-search-choice-close { display: block; width: 12px; height: 13px; position: absolute; right: 3px; - top: 4px; + top: 3px; font-size: 1px; outline: none; background: url("/bundles/orotag/img/select2.png") right top no-repeat; } + diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/collections/tag.js b/src/Oro/Bundle/TagBundle/Resources/public/js/collections/tag.js index f5f6378e713..77651539e2d 100644 --- a/src/Oro/Bundle/TagBundle/Resources/public/js/collections/tag.js +++ b/src/Oro/Bundle/TagBundle/Resources/public/js/collections/tag.js @@ -22,12 +22,45 @@ Oro.Tags.TagCollection = Backbone.Collection.extend({ return new Oro.Tags.TagCollection(filtered); }, - toArray: function() { - var tagArray = []; - _.each(this.models, function(tag) { - tagArray.push(tag.attributes); - }); + /** + * Used for adding item on tag_update view + * + * @param {Object} value + */ + addItem: function(value) { + // check if exists tag + var exist = this.where({name: value.name}); + if (exist.length && exist[0].get('owner') == false) { + // adding to owner + exist[0].set('owner', true); + this.trigger('add'); + + return; + } + + var tag = new this.model({id: value.id, name: value.name, owner: true, notSaved: true}); + + this.add(tag); + }, - return tagArray; + /** + * Remove item from collection, or uncheck "owner" if filter is not in global mdoe + * + * @param {String}|{Number} id + * @param {String} filterState + */ + removeItem: function(id, filterState) { + var model = this.where({'id': id}); + if (model.length) { + model = model[0]; + if (filterState == 'owner' && model.get('owner') === true && model.get('moreOwners') === true) { + model.set('owner', false); + + this.trigger('remove'); + + return; + } + this.remove(model); + } } }); diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/models/tag.js b/src/Oro/Bundle/TagBundle/Resources/public/js/models/tag.js index e57a8411c98..ae7669de5b4 100644 --- a/src/Oro/Bundle/TagBundle/Resources/public/js/models/tag.js +++ b/src/Oro/Bundle/TagBundle/Resources/public/js/models/tag.js @@ -3,8 +3,10 @@ Oro.Tags = Oro.Tags || {}; Oro.Tags.Tag = Backbone.Model.extend({ defaults: { - owner : false, - url : '', - name : '' + owner : false, + notSaved : false, + moreOwners: false, + url : '', + name : '' } }); diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/views/select2.js b/src/Oro/Bundle/TagBundle/Resources/public/js/views/select2.js deleted file mode 100644 index 2e1961d38b1..00000000000 --- a/src/Oro/Bundle/TagBundle/Resources/public/js/views/select2.js +++ /dev/null @@ -1,86 +0,0 @@ -Oro = Oro || {}; -Oro.Tags = Oro.Tags || {}; - -Oro.Tags.Select2View = Oro.Tags.TagView.extend({ - options: { - tagInputId: null, - tags: null - }, - - /** - * Constructor - */ - initialize: function() { - this.collection = new Oro.Tags.TagCollection(); - this.ownCollection = new Oro.Tags.TagCollection(); - - this.listenTo(this.getCollection(), 'reset', this.render); - this.listenTo(this.getCollection('owner'), 'reset', this.render); - this.listenTo(this, 'filter', this.render); - - $('#tag-sort-actions a').click(_.bind(this.filter, this)); - - self = this; - $(this.options.tagInputId).on("change", this.updateHiddenInputs); - - if (this.options.tags != null) { - this.getCollection().reset(this.options.tags); - this.getCollection('owner').reset(this.getCollection().getFilteredCollection('owner').models); - } - }, - - getCollection: function(type) { - if (type == undefined || type == 'all') { - return this.collection; - } else if (type == 'owner') { - return this.ownCollection; - } else { - return {}; - } - }, - - updateHiddenInputs: function(event) { - var owner = self.options.filter == undefined ? 'all' : self.options.filter; - - if (event && event.added) { - event.added.owner = true; - owner = 'owner'; - self.getCollection('owner').add(event.added); - } - else if (event && event.removed) { - self.getCollection(owner).remove(event.removed); - } - - $(self.options.tagInputId + '_owner').val(self.getCollection('owner').pluck('id')); - $(self.options.tagInputId + '_all').val(self.getCollection().pluck('id')); - - $(self.options.tagInputId).select2('data', self.getCollection(owner).toArray()); - }, - - /** - * Render widget - * - * @returns {} - */ - render: function() { - this.updateHiddenInputs(); - - var tagCollection = new Oro.Tags.TagCollection(); - tagCollection.add(this.getCollection().models); - tagCollection.add(this.getCollection('owner').models); - - $('.select2-search-choice div').click(function(){ - var tagName = $(this).attr('title'); - var tag = tagCollection.toArray().filter(function(item){ return item.name == tagName }) - var url = tag[0].url; - - if (Oro.hashNavigationEnabled()) { - Oro.hashNavigationInstance.setLocation(url); - } else { - window.location = url; - } - }); - - return this; - } -}); diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/views/tag.js b/src/Oro/Bundle/TagBundle/Resources/public/js/views/tag.js index d649468df32..4d0c82b6717 100644 --- a/src/Oro/Bundle/TagBundle/Resources/public/js/views/tag.js +++ b/src/Oro/Bundle/TagBundle/Resources/public/js/views/tag.js @@ -6,6 +6,26 @@ Oro.Tags.TagView = Backbone.View.extend({ filter: null }, + /** @property */ + template: _.template( + '- ' +
+ '<% _.each(models, function(tag, i) { %>' +
+ '
' +
+ '
'
+ ),
+
+ /** @property {Object} */
+ options: {
+ filter: null,
+ tagsOverlayId: '#tags-overlay',
+ autocompleteFieldId: null,
+ fieldId: null,
+ ownFieldId: null,
+ unassign: false,
+ unassignGlobal: false
+ },
+
+ /**
+ * Initialize widget
+ *
+ * @param {Object} options
+ * @param {Backbone.Collection} options.tags
+ * @param {String} options.autocompleteFieldId DomElement ID of autocomplete widget
+ * @param {String} options.fieldId DomElement ID of hidden field with all tags
+ * @param {String} options.ownFieldId DomElement ID of hidden field with own tags
+ * @throws {TypeError} If mandatory options are undefined
+ */
+ initialize: function(options) {
+ options = options || {};
+
+ if (!options.autocompleteFieldId) {
+ throw new TypeError("'autocompleteFieldId' is required")
+ }
+
+ if (!options.fieldId) {
+ throw new TypeError("'fieldId' is required")
+ }
+
+ if (!options.ownFieldId) {
+ throw new TypeError("'ownFieldId' is required")
+ }
+
+ Oro.Tags.TagView.prototype.initialize.apply(this, arguments);
+
+
+ this._renderOverlay();
+ this._prepareCollections();
+ this.listenTo(this.getCollection(), 'add', this.render);
+ this.listenTo(this.getCollection(), 'add', this._updateHiddenInputs);
+ this.listenTo(this.getCollection(), 'remove', this.render);
+ this.listenTo(this.getCollection(), 'remove', this._updateHiddenInputs);
+
+ $(this.options.autocompleteFieldId).on('change', _.bind(this._addItem, this));
+ },
+
+ /**
+ * Render widget
+ *
+ * @returns {}
+ */
+ render: function() {
+ Oro.Tags.TagView.prototype.render.apply(this, arguments);
+
+ var renderButtons = false;
+ switch (true) {
+ case this.options.filter == 'owner' && this.options.unassign:
+ renderButtons = true;
+ break;
+ case this.options.filter != 'owner' && this.options.unassignGlobal:
+ renderButtons = true;
+ break;
+ }
+ if (renderButtons) {
+ $(this.options.tagsOverlayId).find('span.label').each(function(i, el) {
+ var $el = $(el);
+
+ $el.append($(''));
+ $el.addClass('with-button');
+ });
+
+ $(this.options.tagsOverlayId).find('span.label .select2-search-choice-close').click(_.bind(this._removeItem, this));
+ }
+ },
+
+ /**
+ * Add item from autocomplete to internal collection
+ *
+ * @param {Object} e select2.change event object
+ * @private
+ */
+ _addItem: function(e) {
+ e.preventDefault();
+ var tag = e.added;
+
+ if (!_.isUndefined(tag)) {
+ this.getCollection().addItem(tag);
+ }
+
+ // clear autocomplete
+ $(e.target).select2('val', '');
+ },
+
+ /**
+ * Removes item
+ *
+ * @param e
+ * @returns {*}
+ * @private
+ */
+ _removeItem: function(e) {
+ e.preventDefault();
+ e.stopImmediatePropagation();
+
+ var $el = $(e.currentTarget).parents('li');
+
+ var id = $($el).data('id');
+ if (!_.isUndefined(id)) {
+ this.getCollection().removeItem(id, this.options.filter);
+ }
+ return this;
+ },
+
+ /**
+ * Render overlay block
+ *
+ * @returns {*}
+ * @private
+ */
+ _renderOverlay: function() {
+ $(this.options.tagsOverlayId).append(this.tagsOverlayTemplate());
+
+ return this;
+ },
+
+ /**
+ * Fill data to collections from hidden inputs
+ *
+ * @returns {*}
+ * @private
+ */
+ _prepareCollections: function() {
+ try {
+ var allTags = $.parseJSON($(this.options.fieldId).val());
+ if (! _.isArray(allTags)) {
+ throw new TypeError("tags hidden field data is not array")
+ }
+ } catch (e) {
+ allTags = [];
+ }
+
+ this.getCollection().reset(allTags);
+
+ return this;
+ },
+
+ /**
+ * Update hidden inputs triggered by collection change
+ *
+ * @private
+ */
+ _updateHiddenInputs: function() {
+ $(this.options.fieldId).val(JSON.stringify(this.getCollection()));
+ $(this.options.ownFieldId).val(JSON.stringify(this.getCollection().getFilteredCollection('owner')));
+ }
+});
diff --git a/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
index 4c0625609ef..a0ad0340a25 100644
--- a/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
@@ -1,4 +1,5 @@
oro:
tag:
controller.tag.saved.message: "Tag successfully saved"
- form.choose_tag: "Choose or create tag"
+ form.choose_tag: "Choose a tag"
+ form.choose_or_create_tag: "Choose or create a tag"
diff --git a/src/Oro/Bundle/TagBundle/Resources/views/Form/fields.html.twig b/src/Oro/Bundle/TagBundle/Resources/views/Form/fields.html.twig
index 50df37ba5e9..0ca1ccf947f 100644
--- a/src/Oro/Bundle/TagBundle/Resources/views/Form/fields.html.twig
+++ b/src/Oro/Bundle/TagBundle/Resources/views/Form/fields.html.twig
@@ -1,19 +1,77 @@
+
+{% block oro_tag_select_row %}
+ {% if resource_granted('oro_tag_view_tag_cloud') %}
+ {% if resource_granted('oro_tag_assign_unassign') %}
+ ' +
+ '' +
+ '
' +
+ '
+ {{ form_label(form, '' , { label_attr: label_attr|merge({ class: 'control-label' })}) }}
+
+ {% import 'OroTagBundle::macros.html.twig' as _tag %}
+
+
+ {% endif %}
+
+ {{ form_row(form.all) }}
+ {{ form_row(form.owner) }}
+
+
+
+
+
+
+ {{ _tag.tagSortActions() }}
+
+
+ {{ form_row(form.autocomplete) }}
+
+
+ {% if not resource_granted('oro_tag_assign_unassign') %}
+ {{ form_label(form, '' , { label_attr: label_attr|merge({ class: 'control-label' })}) }}
+ {% endif %}
+
+
+
+ {% else %}
+ {{ form_row(form.all) }}
+ {{ form_row(form.owner) }}
+ {% endif %}
+{% endblock %}
+
{% block oro_combobox_dataconfig_multi_autocomplete %}
{{ block('oro_combobox_dataconfig_autocomplete') }}
-
- select2Config.multiple = true;
select2Config.createSearchChoice = function(term, data) {
- if ($(data).filter(function() {
- return this.name.localeCompare(term) === 0;
- }).length === 0) {
+ if (
+ $(data).filter(function() {
+ return this.name.toLowerCase().localeCompare(term.toLowerCase()) === 0;
+ }).length === 0
+ ) {
+ {% if not resource_granted('oro_tag_create') %}
+ return null;
+ {% else %}
+ return {
+ id: term,
+ name: term
+ };
+ {% endif %}
+ }
+ }
+
{% if not resource_granted('oro_tag_create') %}
- return null;
- {% else %}
- return {
- id: term,
- name: term
- };
+ select2Config.placeholder = '{{ 'oro.tag.form.choose_tag'|trans }}';
{% endif %}
- }
- }
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block oro_tag_autocomplete_row %}
+ {{ form_widget(form) }}
+ {{ form_javascript(form) }}
+{% endblock %}
diff --git a/src/Oro/Bundle/TagBundle/Resources/views/Tag/update.html.twig b/src/Oro/Bundle/TagBundle/Resources/views/Tag/update.html.twig
index a4915f86946..b4442835941 100644
--- a/src/Oro/Bundle/TagBundle/Resources/views/Tag/update.html.twig
+++ b/src/Oro/Bundle/TagBundle/Resources/views/Tag/update.html.twig
@@ -1,6 +1,6 @@
{% extends 'OroUIBundle:actions:update.html.twig' %}
{% form_theme form with 'OroUIBundle:Form:fields.html.twig' %}
-{% set title = form.vars.value.id ? form.vars.value.name|default('N/A') : 'Add Tag'|trans %}
+{% set title = form.vars.value.id ? form.vars.value.name|default('N/A') : 'New Tag'|trans %}
{% if form.vars.value.id %}
{% oro_title_set({params : {"%tag.name%": form.vars.value.name} }) %}
{% endif %}
@@ -59,7 +59,6 @@
{
'formErrors': form_errors(form)? form_errors(form) : null,
'dataBlocks': dataBlocks,
- 'hiddenData': form_rest(form)
}
%}
{{ parent() }}
diff --git a/src/Oro/Bundle/TagBundle/Resources/views/javascript.html.twig b/src/Oro/Bundle/TagBundle/Resources/views/javascript.html.twig
deleted file mode 100644
index 0f7e787c7d8..00000000000
--- a/src/Oro/Bundle/TagBundle/Resources/views/javascript.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{% block oro_tag_view_js %}
-
-{% endblock oro_tag_view_js %}
diff --git a/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig
index bb1f6d7fedc..025965473d7 100644
--- a/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig
@@ -1,11 +1,4 @@
{% macro renderView(entity) %}
- {# // check if block was not included yet #}
- {% set _block = block('oro_tag_view_js') %}
- {% if (_block is empty) %}
- {% include 'OroTagBundle::javascript.html.twig' %}
- {{ block('oro_tag_view_js')|raw }}
- {% endif %}
-