-
Notifications
You must be signed in to change notification settings - Fork 214
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 #1119 from LaravelRUS/merge-dev-to-master
Merge remote-tracking branch 'origin/development' (bootstrap 3) to master
- Loading branch information
Showing
256 changed files
with
4,244 additions
and
1,957 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
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
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,76 +1,74 @@ | ||
| { | ||
| "name": "laravelrus/sleepingowl", | ||
| "description": "Administrative interface builder for Laravel.", | ||
| "homepage": "http://sleepingowladmin.ru", | ||
| "keywords": [ | ||
| "laravel", | ||
| "admin", | ||
| "bread", | ||
| "crud", | ||
| "panel", | ||
| "interface" | ||
|
|
||
| ], | ||
| "license": "MIT", | ||
| "support": { | ||
| "issues": "https://github.com/LaravelRUS/SleepingOwlAdmin/issues", | ||
| "source": "https://github.com/LaravelRUS/SleepingOwlAdmin" | ||
| }, | ||
| "authors": [ | ||
| { | ||
| "name": "Sleeping Owl", | ||
| "email": "[email protected]" | ||
| "name": "laravelrus/sleepingowl", | ||
| "description": "Administrative interface builder for Laravel.", | ||
| "homepage": "http://sleepingowladmin.ru", | ||
| "keywords": [ | ||
| "laravel", | ||
| "admin", | ||
| "administrator", | ||
| "crud", | ||
| "panel" | ||
| ], | ||
| "license": "MIT", | ||
| "support": { | ||
| "issues": "https://github.com/LaravelRUS/SleepingOwlAdmin/issues", | ||
| "source": "https://github.com/LaravelRUS/SleepingOwlAdmin" | ||
| }, | ||
| { | ||
| "name": "Pavel Buchnev", | ||
| "email": "[email protected]" | ||
| "authors": [ | ||
| { | ||
| "name": "Sleeping Owl", | ||
| "email": "[email protected]" | ||
| }, | ||
| { | ||
| "name": "Pavel Buchnev", | ||
| "email": "[email protected]" | ||
| }, | ||
| { | ||
| "name": "Dave Gabrielyan", | ||
| "email": "[email protected]" | ||
| }, | ||
| { | ||
| "name": "TheArdent", | ||
| "email": "[email protected]" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=7.1.3", | ||
| "ext-json": "*", | ||
| "laravel/framework": "~5.5 || ~6.0", | ||
| "kodicomponents/support": "0.*", | ||
| "kodicomponents/navigation": "0.*", | ||
| "doctrine/dbal": "~2.3", | ||
| "laravelcollective/html": "~5.5 || ~6.0", | ||
| "kodicms/laravel-assets": "0.*", | ||
| "erusev/parsedown": "1.*", | ||
| "davejamesmiller/laravel-breadcrumbs": "~4.0 || ~5.0", | ||
| "barryvdh/laravel-ide-helper": "^2.4.3" | ||
| }, | ||
| { | ||
| "name": "Dave Gabrielyan", | ||
| "email": "[email protected]" | ||
| "require-dev": { | ||
| "phpunit/phpunit": "~7.0 || ~8.0", | ||
| "mockery/mockery": "~0.9 || ~1.0", | ||
| "orchestra/testbench": "^3.5 || ^4.0" | ||
| }, | ||
| { | ||
| "name": "TheArdent", | ||
| "email": "[email protected]" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=7.1.3", | ||
| "ext-json": "*", | ||
| "laravel/framework": "~5.6", | ||
| "kodicomponents/support": "0.*", | ||
| "kodicomponents/navigation": "0.*", | ||
| "doctrine/dbal": "~2.3", | ||
| "laravelcollective/html": "5.5.* || 5.6.* || 5.7.* || 5.8.*", | ||
| "kodicms/laravel-assets": "0.*", | ||
| "erusev/parsedown": "1.*", | ||
| "davejamesmiller/laravel-breadcrumbs": "3.0.* || 5.2.*", | ||
| "barryvdh/laravel-ide-helper": "^2.4.3" | ||
| }, | ||
| "require-dev": { | ||
| "phpunit/phpunit": "^7.0 || ^8.0", | ||
| "mockery/mockery": "0.9.* || ~1.2", | ||
| "orchestra/testbench": "~3.5 || ~3.6 || ~3.8" | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { | ||
| "SleepingOwl\\Admin\\": "src/", | ||
| "SleepingOwl\\Tests\\": "tests/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "classmap": [ | ||
| "tests/TestCase.php" | ||
| ] | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-development": "5.6.x-dev" | ||
| "autoload": { | ||
| "psr-4": { | ||
| "SleepingOwl\\Admin\\": "src/", | ||
| "SleepingOwl\\Tests\\": "tests/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "classmap": [ | ||
| "tests/TestCase.php" | ||
| ] | ||
| }, | ||
| "laravel": { | ||
| "providers": [ | ||
| "SleepingOwl\\Admin\\Providers\\SleepingOwlServiceProvider" | ||
| ] | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-development": "5.6.x-dev" | ||
| }, | ||
| "laravel": { | ||
| "providers": [ | ||
| "SleepingOwl\\Admin\\Providers\\SleepingOwlServiceProvider" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
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
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| Admin.Modules.register('display.actions_form', () => { | ||
| $('.display-actions-form-wrapper form').on('submit', function (e) { | ||
|
|
||
| e.preventDefault(); | ||
| let self = $(this); | ||
| let confirm = $(self).attr('data-confirm') || true; | ||
| var result = $(self).attr('data-result') || true; | ||
| var result_timeout = $(self).attr('data-result-timeout') || 5000; | ||
|
|
||
| var run_action = function() { | ||
| let $datatable_wrapper = $(self).parents('.panel').find('.dataTables_wrapper'), | ||
| $checkboxes = $datatable_wrapper.find('.adminCheckboxRow').filter(':checked'), | ||
| data = $(self).serialize() + '&' + $checkboxes.serialize(); | ||
|
|
||
| let settings = { | ||
| url: $(self).attr('action'), | ||
| type: $(self).attr('method'), | ||
| data: data, | ||
| dataType: 'json' | ||
| }; | ||
|
|
||
| Admin.Events.fire("datatables::actions::submitting", settings); | ||
|
|
||
| $.ajax(settings).done(function (msg) { | ||
| if (msg.hasOwnProperty('text')) { | ||
| if (result !== 'false' && result !== false && result !== '0' && result !== 0) { | ||
| swal({title: msg.text, text: msg.message, type: msg.type, timer: result_timeout}) | ||
| } else { | ||
| console.log(msg); | ||
| } | ||
| } | ||
| if (msg.hasOwnProperty('__callback')) { | ||
| let callback_name = msg.__callback; | ||
| if (typeof window[callback_name] == 'function') { | ||
| window[callback_name]($datatable_wrapper, $checkboxes); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| Admin.Events.fire("datatables::actions::submitted", self); | ||
| }; | ||
|
|
||
| if (confirm !== 'false' && confirm !== false && confirm !== '0' && confirm !== 0) { | ||
| Admin.Messages.confirm(trans('lang.table.action-confirm'), null, self).then(result => { | ||
| if (result.value) { | ||
| run_action(); | ||
| } else { | ||
| Admin.Events.fire("datatables::actions::cancel", self); | ||
| } | ||
| }); | ||
| } else { | ||
| run_action(); | ||
| } | ||
|
|
||
| return false; | ||
| }); | ||
| }) |
Oops, something went wrong.