Skip to content

winter 1.2.8 support #3

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

Merged
LukeTowers merged 4 commits into from
Jul 16, 2025
Merged

winter 1.2.8 support #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29c542a
use behavior default views
mjauvin May 3, 2025
854260e
remove create/update views
mjauvin May 5, 2025
8c47e53
revert to default fancy toolbar; rename partials to php
mjauvin May 8, 2025
6b3c14d
Remove dependency on hidden field that is no longer present
LukeTowers May 28, 2025
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
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
},
"require": {
"php": ">=7.2",
"winter/wn-backend-module": "~1.2.8",
"composer/installers": "~1.0"
},
"replace": {
Expand Down
57 changes: 26 additions & 31 deletions controllers/Notifications.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<?php namespace Winter\Notify\Controllers;

use Str;
use Lang;
use File;
use Mail;
use Flash;
use Backend;
use Redirect;
use BackendMenu;
<?php

namespace Winter\Notify\Controllers;

use Backend\Classes\Controller;
use Winter\Notify\Models\NotificationRule;
use Backend\Facades\Backend;
use Backend\Facades\BackendMenu;
use Exception;
use System\Classes\SettingsManager;
use Winter\Notify\Classes\EventBase;
use ApplicationException;
use Exception;
use Winter\Notify\Models\NotificationRule;
use Winter\Storm\Exception\ApplicationException;

/**
* Notification rules controller
Expand All @@ -30,12 +26,11 @@ class Notifications extends Controller

public $requiredPermissions = ['winter.notify.manage_notifications'];

public $listConfig = 'config_list.yaml';
public $formConfig = 'config_form.yaml';

public $eventAlias;
protected $eventClass;

public $formLayout = 'fancy';

public function __construct()
{
parent::__construct();
Expand All @@ -52,24 +47,24 @@ public function index()

public function create($eventAlias = null)
{
try {
if (!$eventAlias) {
throw new ApplicationException('Missing a rule code');
}

$this->eventAlias = $eventAlias;
$this->bodyClass = 'compact-container breadcrumb-fancy';
$this->asExtension('FormController')->create();
}
catch (Exception $ex) {
$this->handleError($ex);
if (empty($eventAlias)) {
abort(404);
}

$this->eventAlias = $eventAlias;

$this->asExtension('FormController')->create();
}

public function update($recordId = null, $context = null)
public function create_onSave($eventAlias = null)
{
$this->bodyClass = 'compact-container breadcrumb-fancy';
$this->asExtension('FormController')->update($recordId, $context);
if (empty($eventAlias)) {
abort(404);
}

$this->eventAlias = $eventAlias;

return $this->asExtension('FormController')->create_onSave();
}

public function formExtendModel($model)
Expand Down Expand Up @@ -122,7 +117,7 @@ public function index_onLoadRuleEventForm()

protected function getEventClass()
{
$alias = post('event_alias', $this->eventAlias);
$alias = $this->eventAlias;

if ($this->eventClass !== null) {
return $this->eventClass;
Expand Down
0 ...rs/notifications/_add_rule_event_form.htm → ...rs/notifications/_add_rule_event_form.php
View file
Open in desktop
File renamed without changes.
0 ...rs/notifications/_add_rule_group_form.htm → ...rs/notifications/_add_rule_group_form.php
View file
Open in desktop
File renamed without changes.
49 changes: 0 additions & 49 deletions controllers/notifications/_form_toolbar.htm
View file
Open in desktop

This file was deleted.

0 controllers/notifications/_list_toolbar.htm → controllers/notifications/_list_toolbar.php
View file
Open in desktop
File renamed without changes.
31 changes: 0 additions & 31 deletions controllers/notifications/create.htm
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions controllers/notifications/index.htm
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions controllers/notifications/update.htm
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion models/notificationrule/fields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ fields:

toolbar:
type: partial
path: form_toolbar
cssClass: collapse-visible

tabs:
Expand Down