Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Added edit_other_product capability check for digital assets to allow list, read, edit, or delete, reported by @Mitchell45

givanz0463ae60cda5
diff --git a/admin/controller/product/digital-asset.php b/admin/controller/product/digital-asset.php
index ddbeedb..bd3c501 100644
--- a/admin/controller/product/digital-asset.php
+++ b/admin/controller/product/digital-asset.php
@@ -25,6 +25,7 @@ namespace Vvveb\Controller\Product;
use Vvveb\Controller\Crud;
use Vvveb\System\Images;
use Vvveb\System\Traits\Media as MediaTrait;
+use Vvveb\System\User\Admin;
class DigitalAsset extends Crud {
use MediaTrait;
@@ -37,7 +38,25 @@ class DigitalAsset extends Crud {
protected $module = 'product';
+ function save() {
+ $editCapability = 'edit_other_products';
+
+ if (Admin::hasCapability($editCapability)) {
+ $this->adminFilter = false;
+ } else {
+ }
+
+ parent::save();
+ }
+
function index() {
+ $editCapability = 'view_other_products';
+
+ if (Admin::hasCapability($editCapability)) {
+ $this->adminFilter = false;
+ } else {
+ }
+
parent::index();
$adminPath = \Vvveb\adminPath();
diff --git a/admin/controller/product/digital-assets.php b/admin/controller/product/digital-assets.php
old mode 100755
new mode 100644
index 3efa0b8..e9bc589
--- a/admin/controller/product/digital-assets.php
+++ b/admin/controller/product/digital-assets.php
@@ -23,6 +23,7 @@
namespace Vvveb\Controller\Product;
use Vvveb\Controller\Listing;
+use Vvveb\System\User\Admin;
class DigitalAssets extends Listing {
protected $additionalPermissionCheck = ['product/digital-asset/save'];
@@ -36,4 +37,26 @@ class DigitalAssets extends Listing {
protected $list = 'digital_asset';
protected $module = 'product';
+
+ function delete() {
+ $editCapability = 'edit_other_products';
+
+ if (Admin::hasCapability($editCapability)) {
+ $this->adminFilter = false;
+ } else {
+ }
+
+ parent::delete();
+ }
+
+ function index() {
+ $editCapability = 'view_other_products';
+
+ if (Admin::hasCapability($editCapability)) {
+ $this->adminFilter = false;
+ } else {
+ }
+ $this->adminFilter = false;
+ parent::index();
+ }
}
diff --git a/admin/sql/mysqli/digital_asset.sql b/admin/sql/mysqli/digital_asset.sql
index 7c3e4b0..a80a16f 100644
--- a/admin/sql/mysqli/digital_asset.sql
+++ b/admin/sql/mysqli/digital_asset.sql
@@ -5,6 +5,7 @@
PROCEDURE getAll(
IN language_id INT,
IN user_id INT,
+ IN admin_id INT,
IN product_id INT,
IN order_status_id INT,
IN start INT,
@@ -40,7 +41,13 @@
END @IF
WHERE 1 = 1
-
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset.admin_id = :admin_id
+ END @IF
+
-- limit
@IF isset(:limit)
THEN
@@ -60,6 +67,7 @@
PROCEDURE get(
IN digital_asset_id INT,
IN user_id INT,
+ IN admin_id INT,
IN language_id INT,
OUT fetch_row,
)
@@ -78,7 +86,14 @@
INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_id
END @IF
- WHERE _.digital_asset_id = :digital_asset_id;
+ WHERE _.digital_asset_id = :digital_asset_id
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF;
+
END
@@ -117,6 +132,7 @@
CREATE PROCEDURE edit(
IN digital_asset ARRAY,
IN digital_asset_id INT,
+ IN admin_id INT,
OUT affected_rows
OUT affected_rows
)
@@ -129,7 +145,13 @@
SET @LIST(:digital_asset_data)
- WHERE digital_asset_id = :digital_asset_id;
+ WHERE digital_asset_id = :digital_asset_id
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset.admin_id = :admin_id
+ END @IF;
-- allow only table fields and set defaults for missing values
:digital_asset_content = @FILTER(:digital_asset, digital_asset_content)
@@ -138,7 +160,12 @@
SET @LIST(:digital_asset_content)
- WHERE digital_asset_id = :digital_asset_id;
+ WHERE digital_asset_id = :digital_asset_id
+
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset_content.digital_asset_id IN (SELECT digital_asset_id FROM digital_asset WHERE digital_asset.admin_id = :admin_id)
+ END @IF;
END
@@ -147,11 +174,23 @@
PROCEDURE delete(
IN digital_asset_id ARRAY,
+ IN admin_id INT,
OUT affected_rows,
OUT affected_rows,
)
BEGIN
-- digital_asset
- DELETE FROM digital_asset_content WHERE digital_asset_id IN (:digital_asset_id);
- DELETE FROM digital_asset WHERE digital_asset_id IN (:digital_asset_id);
+ DELETE digital_asset_content FROM digital_asset_content WHERE digital_asset_id IN (:digital_asset_id)
+
+ @IF isset(:admin_id)
+ THEN
+ INNER JOIN product ON (product.product_id = digital_asset_content.product_id AND digital_asset_content.admin_id = :admin_id)
+ END @IF;
+
+ DELETE FROM digital_asset WHERE digital_asset_id IN (:digital_asset_id)
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF;
END
diff --git a/admin/sql/pgsql/digital_asset.sql b/admin/sql/pgsql/digital_asset.sql
index 6471686..aba1e55 100644
--- a/admin/sql/pgsql/digital_asset.sql
+++ b/admin/sql/pgsql/digital_asset.sql
@@ -5,6 +5,7 @@
PROCEDURE getAll(
IN language_id INT,
IN user_id INT,
+ IN admin_id INT,
IN product_id INT,
IN order_status_id INT,
IN start INT,
@@ -40,7 +41,13 @@
END @IF
WHERE 1 = 1
-
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset.admin_id = :admin_id
+ END @IF
+
-- limit
@IF isset(:limit)
THEN
@@ -60,6 +67,7 @@
PROCEDURE get(
IN digital_asset_id INT,
IN user_id INT,
+ IN admin_id INT,
IN language_id INT,
OUT fetch_row,
)
@@ -78,7 +86,13 @@
INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_id
END @IF
- WHERE _.digital_asset_id = :digital_asset_id;
+ WHERE _.digital_asset_id = :digital_asset_id
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF;
END
@@ -117,6 +131,7 @@
CREATE PROCEDURE edit(
IN digital_asset ARRAY,
IN digital_asset_id INT,
+ IN admin_id INT,
OUT affected_rows
OUT affected_rows
)
@@ -129,8 +144,14 @@
SET @LIST(:digital_asset_data)
- WHERE digital_asset_id = :digital_asset_id;
-
+ WHERE digital_asset_id = :digital_asset_id
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset.admin_id = :admin_id
+ END @IF;
+
-- allow only table fields and set defaults for missing values
:digital_asset_content = @FILTER(:digital_asset, digital_asset_content)
@@ -138,7 +159,12 @@
SET @LIST(:digital_asset_content)
- WHERE digital_asset_id = :digital_asset_id;
+ WHERE digital_asset_id = :digital_asset_id
+
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset_content.digital_asset_id IN (SELECT digital_asset_id FROM digital_asset WHERE digital_asset.admin_id = :admin_id)
+ END @IF;
END
@@ -147,11 +173,23 @@
PROCEDURE delete(
IN digital_asset_id ARRAY,
+ IN admin_id INT,
OUT affected_rows,
OUT affected_rows,
)
BEGIN
-- digital_asset
- DELETE FROM digital_asset_content WHERE digital_asset_id IN (:digital_asset_id);
- DELETE FROM digital_asset WHERE digital_asset_id IN (:digital_asset_id);
+ DELETE digital_asset_content FROM digital_asset_content WHERE digital_asset_id IN (:digital_asset_id)
+
+ @IF isset(:admin_id)
+ THEN
+ INNER JOIN product ON (product.product_id = digital_asset_content.product_id AND digital_asset_content.admin_id = :admin_id)
+ END @IF;
+
+ DELETE FROM digital_asset WHERE digital_asset_id IN (:digital_asset_id)
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF;
END
diff --git a/admin/sql/sqlite/digital_asset.sql b/admin/sql/sqlite/digital_asset.sql
index 46ab367..d097258 100644
--- a/admin/sql/sqlite/digital_asset.sql
+++ b/admin/sql/sqlite/digital_asset.sql
@@ -5,6 +5,7 @@
PROCEDURE getAll(
IN language_id INT,
IN user_id INT,
+ IN admin_id INT,
IN product_id INT,
IN order_status_id INT,
IN start INT,
@@ -40,7 +41,13 @@
END @IF
WHERE 1 = 1
-
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset.admin_id = :admin_id
+ END @IF
+
-- limit
@IF isset(:limit)
THEN
@@ -60,6 +67,7 @@
PROCEDURE get(
IN digital_asset_id INT,
IN user_id INT,
+ IN admin_id INT,
IN language_id INT,
OUT fetch_row,
)
@@ -78,7 +86,13 @@
INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_id
END @IF
- WHERE _.digital_asset_id = :digital_asset_id;
+ WHERE _.digital_asset_id = :digital_asset_id
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF;
END
@@ -117,6 +131,7 @@
CREATE PROCEDURE edit(
IN digital_asset ARRAY,
IN digital_asset_id INT,
+ IN admin_id INT,
OUT affected_rows
OUT affected_rows
)
@@ -129,8 +144,14 @@
SET @LIST(:digital_asset_data)
- WHERE digital_asset_id = :digital_asset_id;
-
+ WHERE digital_asset_id = :digital_asset_id
+
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset.admin_id = :admin_id
+ END @IF;
+
-- allow only table fields and set defaults for missing values
:digital_asset_content = @FILTER(:digital_asset, digital_asset_content)
@@ -138,7 +159,12 @@
SET @LIST(:digital_asset_content)
- WHERE digital_asset_id = :digital_asset_id;
+ WHERE digital_asset_id = :digital_asset_id
+
+ @IF isset(:admin_id)
+ THEN
+ AND digital_asset_content.digital_asset_id IN (SELECT digital_asset_id FROM digital_asset WHERE digital_asset.admin_id = :admin_id)
+ END @IF;
END
@@ -147,11 +173,23 @@
PROCEDURE delete(
IN digital_asset_id ARRAY,
+ IN admin_id INT,
OUT affected_rows,
OUT affected_rows,
)
BEGIN
-- digital_asset
- DELETE FROM digital_asset_content WHERE digital_asset_id IN (:digital_asset_id);
- DELETE FROM digital_asset WHERE digital_asset_id IN (:digital_asset_id);
+ DELETE digital_asset_content FROM digital_asset_content WHERE digital_asset_id IN (:digital_asset_id)
+
+ @IF isset(:admin_id)
+ THEN
+ INNER JOIN product ON (product.product_id = digital_asset_content.product_id AND digital_asset_content.admin_id = :admin_id)
+ END @IF;
+
+ DELETE FROM digital_asset WHERE digital_asset_id IN (:digital_asset_id)
+ -- admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF;
END
diff --git a/install/sql/insert/digital_asset/digital_asset.sql b/install/sql/insert/digital_asset/digital_asset.sql
index 13a3858..8f1e80d 100644
--- a/install/sql/insert/digital_asset/digital_asset.sql
+++ b/install/sql/insert/digital_asset/digital_asset.sql
@@ -1,2 +1,2 @@
-INSERT INTO `digital_asset` (`digital_asset_id`, `file`, `public`, `created_at`) VALUES
-(1, 'vvveb-documentation.pdf', 'vvveb-documentation.pdf', '2023-10-20 00:32:54');
+INSERT INTO `digital_asset` (`digital_asset_id`, `admin_id`, `file`, `public`, `created_at`) VALUES
+(1, 1, 'vvveb-documentation.pdf', 'vvveb-documentation.pdf', '2023-10-20 00:32:54');
diff --git a/install/sql/pgsql/schema/user/digital_asset.sql b/install/sql/pgsql/schema/user/digital_asset.sql
index 54e9e47..6e5133d 100755
--- a/install/sql/pgsql/schema/user/digital_asset.sql
+++ b/install/sql/pgsql/schema/user/digital_asset.sql
@@ -6,6 +6,7 @@ DROP TABLE IF EXISTS digital_asset;
CREATE TABLE digital_asset (
"digital_asset_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "admin_id" int check ("admin_id" > 0) NOT NULL,
"file" varchar(160) NOT NULL,
"public" varchar(128) NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now()
@@ -13,4 +14,5 @@ CREATE TABLE digital_asset (
);
-SELECT setval('digital_asset_digital_asset_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
+CREATE INDEX "digital_asset_admin" ON digital_asset ("admin_id");
+SELECT setval('digital_asset_digital_asset_id_seq', 1, true); -- last inserted id by sample data