diff --git a/src/Entity/UserSystem/PermissionsEmbed.php b/src/Entity/UserSystem/PermissionsEmbed.php index cddd7788..cb1e552f 100644 --- a/src/Entity/UserSystem/PermissionsEmbed.php +++ b/src/Entity/UserSystem/PermissionsEmbed.php @@ -58,15 +58,21 @@ class PermissionsEmbed public const MANUFACTURERS = 'manufacturers'; public const DEVICES = 'devices'; public const ATTACHMENT_TYPES = 'attachment_types'; + public const MEASUREMENT_UNITS = 'measurement_units'; + public const CURRENCIES = 'currencies'; public const TOOLS = 'tools'; public const PARTS = 'parts'; public const PARTS_NAME = 'parts_name'; public const PARTS_DESCRIPTION = 'parts_description'; - public const PARTS_INSTOCK = 'parts_instock'; - public const PARTS_MININSTOCK = 'parts_mininstock'; + public const PARTS_MINAMOUNT = 'parts_minamount'; public const PARTS_FOOTPRINT = 'parts_footprint'; + public const PARTS_MPN = 'parts_mpn'; + public const PARTS_STATUS = 'parts_status'; + public const PARTS_TAGS = 'parts_tags'; + public const PARTS_UNIT = 'parts_unit'; + public const PARTS_MASS = 'parts_mass'; + public const PARTS_LOTS = 'parts_lots'; public const PARTS_COMMENT = 'parts_comment'; - public const PARTS_STORELOCATION = 'parts_storelocation'; public const PARTS_MANUFACTURER = 'parts_manufacturer'; public const PARTS_ORDERDETAILS = 'parts_orderdetails'; public const PARTS_PRICES = 'parts_prices'; diff --git a/tests/Entity/PermissionsEmbedTest.php b/tests/Entity/PermissionsEmbedTest.php index 999d2146..88e5bd81 100644 --- a/tests/Entity/PermissionsEmbedTest.php +++ b/tests/Entity/PermissionsEmbedTest.php @@ -64,9 +64,8 @@ class PermissionsEmbedTest extends TestCase $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_COMMENT, 0)); $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_DESCRIPTION, 0)); $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_FOOTPRINT, 0)); - $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_INSTOCK, 0)); $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_MANUFACTURER, 0)); - $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_MININSTOCK, 0)); + $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_MINAMOUNT, 0)); $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_NAME, 0)); $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_ORDER, 0)); $this->assertEquals(null, $embed->getPermissionValue(PermissionsEmbed::PARTS_ORDERDETAILS, 0)); diff --git a/tests/Services/PermissionResolverTest.php b/tests/Services/PermissionResolverTest.php index eca6ba39..bb8ff6fd 100644 --- a/tests/Services/PermissionResolverTest.php +++ b/tests/Services/PermissionResolverTest.php @@ -62,7 +62,7 @@ class PermissionResolverTest extends WebTestCase $user_embed->setPermissionValue('parts', 0, true) //read ->setPermissionValue('parts', 2, false) //edit ->setPermissionValue('parts', 4, null) //create - ->setPermissionValue('parts', 6, null) //move + ->setPermissionValue('parts', 30, null) //move ->setPermissionValue('parts', 8, null); //delete $this->user = $this->createMock(User::class); @@ -74,6 +74,7 @@ class PermissionResolverTest extends WebTestCase ->setPermissionValue('parts', 8, false) ->setPermissionValue('parts', 10, null) ->setPermissionValue('parts', 0, false) + ->setPermissionValue('parts', 30, true) ->setPermissionValue('parts', 2, true); $this->group = $this->createMock(Group::class); @@ -104,9 +105,8 @@ class PermissionResolverTest extends WebTestCase [PermissionsEmbed::PARTS_ORDERDETAILS], [PermissionsEmbed::PARTS_NAME], [PermissionsEmbed::PARTS_ORDER], - [PermissionsEmbed::PARTS_MININSTOCK], + [PermissionsEmbed::PARTS_MINAMOUNT], [PermissionsEmbed::PARTS_MANUFACTURER], - [PermissionsEmbed::PARTS_INSTOCK], [PermissionsEmbed::DEVICES], [PermissionsEmbed::PARTS_FOOTPRINT], [PermissionsEmbed::PARTS_DESCRIPTION], @@ -165,7 +165,7 @@ class PermissionResolverTest extends WebTestCase $this->assertTrue($this->service->dontInherit($this->user, 'parts', 'read')); $this->assertFalse($this->service->dontInherit($this->user, 'parts', 'edit')); $this->assertNull($this->service->dontInherit($this->user, 'parts', 'create')); - $this->assertNull($this->service->dontInherit($this->user, 'parts', 'move')); + $this->assertNull($this->service->dontInherit($this->user, 'parts', 'show_history')); $this->assertNull($this->service->dontInherit($this->user, 'parts', 'delete')); } @@ -178,7 +178,7 @@ class PermissionResolverTest extends WebTestCase $this->assertNull($this->service->Inherit($this->user, 'parts', 'create')); //Check for inherit from group - $this->assertTrue($this->service->inherit($this->user, 'parts', 'move')); + $this->assertTrue($this->service->inherit($this->user, 'parts', 'show_history')); $this->assertFalse($this->service->inherit($this->user, 'parts', 'delete')); $this->assertNull($this->service->inherit($this->user, 'parts', 'search'));