Skip to content

Commit 1f7bf66

Browse files
ankush-maherwalankush-maherwal
authored
Merge pull request #133 from ankush-maherwal/joomla-4
Joomla 4
2 parents dfaec70 + f3311f1 commit 1f7bf66

File tree

11 files changed

+50
-60
lines changed

11 files changed

+50
-60
lines changed

‎src/com_tjnotifications/admin/models/forms/filter_subscriptions.xml‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<form>
3-
<fields name="filter">
4-
<field name="search" type="text" hint="COM_TJNOTIFICATIONS_SEARCH_FILTER_SUBMIT" label="COM_TJNOTIFICATIONS_FILTER_SEARCH_DESC" class="js-stools-search-string" />
3+
<fields name="filter">
4+
<field name="search" type="text" hint="COM_TJNOTIFICATIONS_SEARCH_FILTER_SUBMIT" label="COM_TJNOTIFICATIONS_FILTER_SEARCH_DESC" class="js-stools-search-string" />
5+
<field name="backend" type="backends" label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_LBL" description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_DESC" onchange="this.form.submit();" />
6+
<field name="platform" type="platforms" label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_LBL" description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_DESC" onchange="this.form.submit();" />
7+
<field name="state" type="list" label="COM_TJNOTIFICATIONS_FILTER_STATE" description="COM_TJNOTIFICATIONS_FILTER_STATE_DESC" onchange="this.form.submit();">
8+
<option value="">JOPTION_SELECT_PUBLISHED</option>
9+
<option value="1">JPUBLISHED</option>
10+
<option value="0">JUNPUBLISHED</option>
11+
<!-- <option value="2">JARCHIVED</option> -->
12+
<option value="-2">JTRASHED</option>
13+
</field>
14+
</fields>
515

6-
<field name="backend" type="backends"
7-
label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_LBL"
8-
description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_DESC"
9-
onchange="this.form.submit();" />
10-
11-
<field name="platform" type="platforms"
12-
label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_LBL"
13-
description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_DESC"
14-
onchange="this.form.submit();" />
15-
16-
<field name="state" type="list" label="COM_TJNOTIFICATIONS_FILTER_STATE" description="COM_TJNOTIFICATIONS_FILTER_STATE_DESC" onchange="this.form.submit();">
17-
<option value="">JOPTION_SELECT_PUBLISHED</option>
18-
<option value="1">JPUBLISHED</option>
19-
<option value="0">JUNPUBLISHED</option>
20-
<!-- <option value="2">JARCHIVED</option> -->
21-
<option value="-2">JTRASHED</option>
22-
</field>
23-
</fields>
24-
25-
<fields name="list">
26-
<field name="fullordering" type="list" label="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING" description="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.id DESC">
27-
<option value="">JGLOBAL_SORT_BY</option>
28-
<option value="a.id ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_ASC</option>
29-
<option value="a.id DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_DESC</option>
30-
<option value="a.title ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_ASC</option>
31-
<option value="a.title DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_DESC</option>
32-
<option value="a.state ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_ASC</option>
33-
<option value="a.state DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_DESC</option>
34-
</field>
35-
36-
<field name="limit" type="limitbox" class="input-mini" default="25" onchange="this.form.submit();" />
37-
</fields>
38-
</form>
16+
<fields name="list">
17+
<field name="fullordering" type="list" label="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING" description="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.id DESC">
18+
<option value="">JGLOBAL_SORT_BY</option>
19+
<option value="a.id ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_ASC</option>
20+
<option value="a.id DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_DESC</option>
21+
<option value="a.title ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_ASC</option>
22+
<option value="a.title DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_DESC</option>
23+
<option value="a.state ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_ASC</option>
24+
<option value="a.state DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_DESC</option>
25+
</field>
26+
<field name="limit" type="limitbox" class="input-mini" default="25" onchange="this.form.submit();" />
27+
</fields>
28+
</form>

‎src/com_tjnotifications/admin/sql/updates/mysql/2.0.0.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ALTER TABLE `#__tj_notification_templates` MODIFY `created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
2-
ALTER TABLE `#__tj_notification_templates` MODIFY `updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
1+
ALTER TABLE `#__tj_notification_templates` MODIFY `created_on` datetime DEFAULT NULL;
2+
ALTER TABLE `#__tj_notification_templates` MODIFY `updated_on` datetime DEFAULT NULL;
33

44
CREATE TABLE IF NOT EXISTS `#__tj_notification_template_configs` (
55
`id` int(11) NOT NULL AUTO_INCREMENT,
@@ -10,8 +10,8 @@ CREATE TABLE IF NOT EXISTS `#__tj_notification_template_configs` (
1010
`body` text NOT NULL,
1111
`params` text NOT NULL,
1212
`state` int(11) NOT NULL,
13-
`created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
14-
`updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
13+
`created_on` datetime DEFAULT NULL,
14+
`updated_on` datetime DEFAULT NULL,
1515
`is_override` int(1) NOT NULL,
1616
PRIMARY KEY (`id`),
1717
CONSTRAINT `#__tj_notification_template_configs` FOREIGN KEY (`template_id`) REFERENCES `#__tj_notification_templates` (`id`)
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_notification_logs` (
2929
`to` text NOT NULL,
3030
`cc` text NOT NULL,
3131
`bcc` text NOT NULL,
32-
`date` datetime NOT NULL,
32+
`date` datetime DEFAULT NULL,
3333
`state` tinyint(2) NOT NULL,
3434
`params` text NOT NULL,
3535
`priority`int(11) NOT NULL,
@@ -51,9 +51,9 @@ CREATE TABLE IF NOT EXISTS `#__tjnotifications_subscriptions` (
5151
`created_by` int(11) NOT NULL,
5252
`modified_by` int(11) NOT NULL,
5353
`checked_out` int(11) NOT NULL,
54-
`created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
55-
`updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
56-
`checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
54+
`created_on` datetime DEFAULT NULL,
55+
`updated_on` datetime DEFAULT NULL,
56+
`checked_out_time` datetime DEFAULT NULL,
5757
`params` text DEFAULT NULL,
5858
PRIMARY KEY (`id`),
5959
KEY `user_id_idx` (`user_id`)

‎src/com_tjnotifications/admin/sql/updates/mysql/3.0.0.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ALTER TABLE `#__tj_notification_logs` CHANGE `bcc` `bcc` text DEFAULT NULL;
4242
ALTER TABLE `#__tj_notification_logs` CHANGE `date` `date` datetime NULL DEFAULT NULL;
4343
ALTER TABLE `#__tj_notification_logs` CHANGE `state` `state` tinyint(2) NOT NULL DEFAULT 0;
4444
ALTER TABLE `#__tj_notification_logs` CHANGE `params` `params` text DEFAULT NULL;
45-
ALTER TABLE `#__tj_notification_logs` CHANGE `priority` `priority`int(11) NOT NULL DEFAULT 0;
45+
ALTER TABLE `#__tj_notification_logs` CHANGE `priority` `priority` int(11) NOT NULL DEFAULT 0;
4646
ALTER TABLE `#__tj_notification_logs` CHANGE `message` `message` text DEFAULT NULL;
4747
ALTER TABLE `#__tj_notification_logs` CHANGE `category` `category` text DEFAULT NULL;
4848

‎src/com_tjnotifications/admin/views/logs/tmpl/default.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metadata>
33
<layout title="COM_TJNOTIFICATIONS_LIST_LOGS" option="View">
44
<message>
5-
<![CDATA[COM_TJNOTIFICATIONS_LIST_LOGS_DESC]]>
5+
<![CDATA[COM_TJNOTIFICATIONS_LIST_LOGS_DESC]]>
66
</message>
77
</layout>
8-
</metadata>
8+
</metadata>

‎src/com_tjnotifications/admin/views/notifications/tmpl/default.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metadata>
33
<layout title="List Notifications" option="View">
44
<message>
5-
<![CDATA[List all notifications]]>
5+
<![CDATA[List all notifications]]>
66
</message>
77
</layout>
8-
</metadata>
8+
</metadata>

‎src/com_tjnotifications/site/views/preferences/tmpl/default.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metadata>
33
<layout title="List Preferences" option="View">
44
<message>
5-
<![CDATA[List all preferences]]>
5+
<![CDATA[List all preferences]]>
66
</message>
77
</layout>
8-
</metadata>
8+
</metadata>

‎src/com_tjnotifications/tjnotifications.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<authorUrl>https://techjoomla.com</authorUrl>
77
<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
88
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
9-
<creationDate>25th Jan 2022</creationDate>
10-
<version>3.0.0</version>
9+
<creationDate>7th Feb 2022</creationDate>
10+
<version>3.0.1</version>
1111
<install>
1212
<sql>
1313
<file driver="mysql" charset="utf8">sql/install.mysql.utf8.sql</file>

‎src/plugins/actionlog/tjnotification/tjnotification.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<extension version="3.9" type="plugin" group="actionlog" method="upgrade">
33
<name>plg_actionlog_tjnotification</name>
44
<author>Techjoomla</author>
5-
<creationDate>25th Jan 2022</creationDate>
5+
<creationDate>7th Feb 2022</creationDate>
66
<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
77
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
88
<authorEmail>[email protected]</authorEmail>
99
<authorUrl>https://techjoomla.com</authorUrl>
10-
<version>3.0.0</version>
10+
<version>3.0.1</version>
1111
<description>PLG_ACTIONLOG_TJNOTIFICATION_XML_DESCRIPTION</description>
1212
<files>
1313
<filename plugin="tjnotification">tjnotification.php</filename>

‎src/plugins/api/tjnotifications/tjnotifications.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<author>Techjoomla</author>
66
<authorEmail>[email protected]</authorEmail>
77
<authorUrl>https://techjoomla.com</authorUrl>
8-
<creationDate>25th Jan 2022</creationDate>
8+
<creationDate>7th Feb 2022</creationDate>
99
<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
1010
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
11-
<version>3.0.0</version>
11+
<version>3.0.1</version>
1212

1313
<files>
1414
<filename plugin="tjnotifications">tjnotifications.php</filename>

‎src/plugins/privacy/tjnotification/tjnotification.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<extension version="3.9" type="plugin" group="privacy" method="upgrade">
33
<name>plg_privacy_tjnotification</name>
4-
<version>3.0.0</version>
5-
<creationDate>25th Jan 2022</creationDate>
4+
<version>3.0.1</version>
5+
<creationDate>7th Feb 2022</creationDate>
66
<author>Techjoomla</author>
77
<authorEmail>[email protected]</authorEmail>
88
<authorUrl>https://techjoomla.com</authorUrl>

0 commit comments

Comments
 (0)