Skip to content

Maxpl patch user edit #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Maxpl patch user edit #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fed56d
hotfix user controller init
Maxpl Mar 23, 2021
058e0c4
Merge branch 'skeeks-cms:master' into master
Maxpl Sep 27, 2021
16ae1ae
Merge branch 'skeeks-cms:master' into master
Maxpl May 25, 2022
c870d8e
Update index.php
Maxpl May 25, 2022
9d1464c
Update AdminUserController.php
Maxpl May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/controllers/AdminUserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ public function actions()
},

"accessCallback" => function () {
if ($this->model) {
if ($this->model && class_exists(ShopOrder::class)) {
return ShopOrder::find()->cmsSite()->andWhere(['cms_user_id' => $this->model->id])->exists();
}

Expand Down
2 changes: 2 additions & 0 deletions src/controllers/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class UserController extends Controller

public function init()
{
parent::init();

if (\Yii::$app->request->get(static::REQUEST_PARAM_USERNAME) && !$this->user) {
throw new NotFoundHttpException("User not found or inactive");
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin-storage/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
?>
<h2><?= \Yii::t('skeeks/cms', 'Servers to store the files.') ?></h2>
<?php foreach (\Yii::$app->storage->getClusters() as $count => $cluster) : ?>
<?php $count = 0; foreach (\Yii::$app->storage->getClusters() as $cluster) : ?>
<div class="sx-box g-pa-10 sx-bg-primary">
<div class="row">
<div class="col-md-12">
Expand Down