-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #141 from techjoomla/release-3.0.2
Release 3.0.2
- Loading branch information
Showing
13 changed files
with
614 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +0,0 @@ | ||
| ----Change table Key; | ||
|
|
||
| ALTER TABLE `#__tj_notification_user_exclusions` DROP INDEX `client1`; | ||
| ALTER TABLE `#__tj_notification_user_exclusions` ADD INDEX `client1` (`client`(100), `provider`(50), `key`(100)); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
src/com_tjnotifications/admin/views/subscription/tmpl/edit_bs2.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?php | ||
| /** | ||
| * @package Tjnotifications | ||
| * @subpackage com_tjnotifications | ||
| * | ||
| * @copyright Copyright (C) 2009 - 2020 Techjoomla. All rights reserved. | ||
| * @license http:/www.gnu.org/licenses/gpl-2.0.html GNU/GPL | ||
| */ | ||
|
|
||
| // No direct access | ||
| defined('_JEXEC') or die('Restricted access'); | ||
|
|
||
| use Joomla\CMS\Language\Text; | ||
| use Joomla\CMS\HTML\HTMLHelper; | ||
| use Joomla\CMS\Factory; | ||
| use Joomla\CMS\Router\Route; | ||
| use Joomla\CMS\Uri\Uri; | ||
|
|
||
| HTMLHelper::_('behavior.keepalive'); | ||
| HTMLHelper::_('behavior.formvalidator'); | ||
| HTMLHelper::_('formbehavior.chosen', 'select'); | ||
| HTMLHelper::_('bootstrap.tooltip'); | ||
|
|
||
| $doc = Factory::getDocument(); | ||
|
|
||
| $script = " | ||
| Joomla.submitbutton = function (task) { | ||
| if (task == 'subscription.cancel') { | ||
| Joomla.submitform(task, document.getElementById('subscription-form')); | ||
| } | ||
| else { | ||
| if (task != 'subscription.cancel' && document.formvalidator.isValid(document.getElementById('subscription-form'))) { | ||
| Joomla.submitform(task, document.getElementById('subscription-form')); | ||
| } | ||
| else { | ||
| alert(Joomla.Text._('JGLOBAL_VALIDATION_FORM_FAILED')); | ||
| } | ||
| } | ||
| } | ||
| "; | ||
|
|
||
| $doc->addScriptDeclaration($script); | ||
|
|
||
| Text::script('JGLOBAL_VALIDATION_FORM_FAILED'); | ||
| ?> | ||
|
|
||
| <div class="subscription-edit row-fluid"> | ||
| <form | ||
| action="<?php echo Route::_('index.php?option=com_tjnotifications&layout=edit&id=' . (int) $this->item->id) . '&extension=' . $this->extension; ?>" | ||
| method="post" enctype="multipart/form-data" name="adminForm" id="subscription-form" class="form-validate form-horizontal"> | ||
|
|
||
| <div class="row-fluid"> | ||
| <?php echo $this->form->renderField('title'); ?> | ||
| <?php echo $this->form->renderField('user_id'); ?> | ||
| <?php echo $this->form->renderField('backend'); ?> | ||
| <?php echo $this->form->renderField('address'); ?> | ||
| <?php echo $this->form->renderField('device_id'); ?> | ||
| <?php echo $this->form->renderField('platform'); ?> | ||
| <?php echo $this->form->renderField('state'); ?> | ||
| <?php echo $this->form->renderField('is_confirmed'); ?> | ||
| </div> | ||
|
|
||
| <input type="hidden" name="extension" value="<?php echo $this->extension; ?>"/> | ||
| <input type="hidden" name="jform[id]" value="<?php echo $this->item->id; ?>" /> | ||
| <input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" /> | ||
| <input type="hidden" name="jform[checked_out]" value="<?php echo $this->item->checked_out; ?>" /> | ||
| <input type="hidden" name="jform[checked_out_time]" value="<?php echo $this->item->checked_out_time; ?>" /> | ||
| <input type="hidden" name="task" value=""/> | ||
|
|
||
| <?php echo HTMLHelper::_('form.token'); ?> | ||
| </form> | ||
| </div> |
71 changes: 71 additions & 0 deletions
71
src/com_tjnotifications/admin/views/subscription/tmpl/edit_bs5.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| <?php | ||
| /** | ||
| * @package Tjnotifications | ||
| * @subpackage com_tjnotifications | ||
| * | ||
| * @copyright Copyright (C) 2009 - 2020 Techjoomla. All rights reserved. | ||
| * @license http:/www.gnu.org/licenses/gpl-2.0.html GNU/GPL | ||
| */ | ||
|
|
||
| // No direct access | ||
| defined('_JEXEC') or die('Restricted access'); | ||
|
|
||
| use Joomla\CMS\Language\Text; | ||
| use Joomla\CMS\HTML\HTMLHelper; | ||
| use Joomla\CMS\Factory; | ||
| use Joomla\CMS\Router\Route; | ||
| use Joomla\CMS\Uri\Uri; | ||
|
|
||
| HTMLHelper::_('behavior.keepalive'); | ||
| HTMLHelper::_('behavior.formvalidator'); | ||
| HTMLHelper::_('bootstrap.tooltip'); | ||
|
|
||
| $doc = Factory::getDocument(); | ||
|
|
||
| $script = " | ||
| Joomla.submitbutton = function (task) { | ||
| if (task == 'subscription.cancel') { | ||
| Joomla.submitform(task, document.getElementById('subscription-form')); | ||
| } | ||
| else { | ||
| if (task != 'subscription.cancel' && document.formvalidator.isValid(document.getElementById('subscription-form'))) { | ||
| Joomla.submitform(task, document.getElementById('subscription-form')); | ||
| } | ||
| else { | ||
| alert(Joomla.Text._('JGLOBAL_VALIDATION_FORM_FAILED')); | ||
| } | ||
| } | ||
| } | ||
| "; | ||
|
|
||
| $doc->addScriptDeclaration($script); | ||
|
|
||
| Text::script('JGLOBAL_VALIDATION_FORM_FAILED'); | ||
| ?> | ||
|
|
||
| <div class="subscription-edit row-fluid tjBs5"> | ||
| <form | ||
| action="<?php echo Route::_('index.php?option=com_tjnotifications&layout=edit&id=' . (int) $this->item->id) . '&extension=' . $this->extension; ?>" | ||
| method="post" enctype="multipart/form-data" name="adminForm" id="subscription-form" class="form-validate form-horizontal"> | ||
|
|
||
| <div class="row-fluid"> | ||
| <?php echo $this->form->renderField('title'); ?> | ||
| <?php echo $this->form->renderField('user_id'); ?> | ||
| <?php echo $this->form->renderField('backend'); ?> | ||
| <?php echo $this->form->renderField('address'); ?> | ||
| <?php echo $this->form->renderField('device_id'); ?> | ||
| <?php echo $this->form->renderField('platform'); ?> | ||
| <?php echo $this->form->renderField('state'); ?> | ||
| <?php echo $this->form->renderField('is_confirmed'); ?> | ||
| </div> | ||
|
|
||
| <input type="hidden" name="extension" value="<?php echo $this->extension; ?>"/> | ||
| <input type="hidden" name="jform[id]" value="<?php echo $this->item->id; ?>" /> | ||
| <input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" /> | ||
| <input type="hidden" name="jform[checked_out]" value="<?php echo $this->item->checked_out; ?>" /> | ||
| <input type="hidden" name="jform[checked_out_time]" value="<?php echo $this->item->checked_out_time; ?>" /> | ||
| <input type="hidden" name="task" value=""/> | ||
|
|
||
| <?php echo HTMLHelper::_('form.token'); ?> | ||
| </form> | ||
| </div> |
Oops, something went wrong.