Skip to content

Commit fd22572

Browse files
authored
Merge pull request #48 from venveo/develop
Finish 4.0.1
2 parents 8682aec + 49b6387 commit fd22572

File tree

3 files changed

+53
-37
lines changed

3 files changed

+53
-37
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Bulk Edit Changelog
22

3+
## 4.0.1 - 2022-10-28
4+
5+
### Fixed
6+
- Fixed "Element query executed before Craft is fully initialized." warning
7+
38
## 4.0.0 - 2022-10-24
49

510
### Added

composer.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "venveo/craft-bulkedit",
33
"description": "Bulk edit Craft CMS element fields",
44
"type": "craft-plugin",
5-
"version": "4.0.0",
65
"keywords": [
76
"craft",
87
"cms",
@@ -35,5 +34,15 @@
3534
"handle": "venveo-bulk-edit",
3635
"changelogUrl": "https://raw.githubusercontent.com/venveo/craft-bulkedit/master/CHANGELOG.md",
3736
"class": "venveo\\bulkedit\\Plugin"
37+
},
38+
"config": {
39+
"sort-packages": true,
40+
"platform": {
41+
"php": "8.0.2"
42+
},
43+
"allow-plugins": {
44+
"yiisoft/yii2-composer": true,
45+
"craftcms/plugin-installer": true
46+
}
3847
}
3948
}

src/Plugin.php

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use craft\events\RegisterElementActionsEvent;
2222
use craft\events\RegisterUserPermissionsEvent;
2323
use craft\services\UserPermissions;
24+
use craft\web\Application;
2425
use venveo\bulkedit\elements\actions\BulkEditElementAction;
2526
use venveo\bulkedit\services\BulkEdit;
2627
use yii\base\Event;
@@ -78,50 +79,51 @@ public function init()
7879
'permissions' => $permissions
7980
];
8081
});
82+
Craft::$app->on(Application::EVENT_INIT, function() {
83+
if (Craft::$app->request->isCpRequest) {
84+
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ENTRIES)) {
85+
Event::on(Entry::class, Element::EVENT_REGISTER_ACTIONS,
86+
function (RegisterElementActionsEvent $event) {
87+
$event->actions[] = BulkEditElementAction::class;
88+
}
89+
);
90+
}
8191

82-
if (Craft::$app->request->isCpRequest) {
83-
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ENTRIES)) {
84-
Event::on(Entry::class, Element::EVENT_REGISTER_ACTIONS,
85-
function(RegisterElementActionsEvent $event) {
86-
$event->actions[] = BulkEditElementAction::class;
87-
}
88-
);
89-
}
90-
91-
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_CATEGORIES)) {
92-
Event::on(Category::class, Element::EVENT_REGISTER_ACTIONS,
93-
function(RegisterElementActionsEvent $event) {
94-
$event->actions[] = BulkEditElementAction::class;
95-
}
96-
);
97-
}
98-
99-
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ASSETS)) {
100-
Event::on(Asset::class, Element::EVENT_REGISTER_ACTIONS,
101-
function(RegisterElementActionsEvent $event) {
102-
$event->actions[] = BulkEditElementAction::class;
103-
}
104-
);
105-
}
92+
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_CATEGORIES)) {
93+
Event::on(Category::class, Element::EVENT_REGISTER_ACTIONS,
94+
function (RegisterElementActionsEvent $event) {
95+
$event->actions[] = BulkEditElementAction::class;
96+
}
97+
);
98+
}
10699

107-
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_USERS)) {
108-
Event::on(User::class, Element::EVENT_REGISTER_ACTIONS,
109-
function(RegisterElementActionsEvent $event) {
110-
$event->actions[] = BulkEditElementAction::class;
111-
}
112-
);
113-
}
100+
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ASSETS)) {
101+
Event::on(Asset::class, Element::EVENT_REGISTER_ACTIONS,
102+
function (RegisterElementActionsEvent $event) {
103+
$event->actions[] = BulkEditElementAction::class;
104+
}
105+
);
106+
}
114107

115-
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_PRODUCTS)) {
116-
if (Craft::$app->plugins->isPluginInstalled('commerce') && class_exists(Product::class)) {
117-
Event::on(Product::class, Element::EVENT_REGISTER_ACTIONS,
118-
function(RegisterElementActionsEvent $event) {
108+
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_USERS)) {
109+
Event::on(User::class, Element::EVENT_REGISTER_ACTIONS,
110+
function (RegisterElementActionsEvent $event) {
119111
$event->actions[] = BulkEditElementAction::class;
120112
}
121113
);
122114
}
115+
116+
if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_PRODUCTS)) {
117+
if (Craft::$app->plugins->isPluginInstalled('commerce') && class_exists(Product::class)) {
118+
Event::on(Product::class, Element::EVENT_REGISTER_ACTIONS,
119+
function (RegisterElementActionsEvent $event) {
120+
$event->actions[] = BulkEditElementAction::class;
121+
}
122+
);
123+
}
124+
}
123125
}
124-
}
126+
});
125127
}
126128

127129
/**

0 commit comments

Comments
 (0)