BaseCode/laravel-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: BaseCode:master
Branches Tags
BaseCode:master
BaseCode:1.0.0
..
compare: BaseCode:1.0.0
Branches Tags
BaseCode:master
BaseCode:1.0.0

No commits in common. "master" and "1.0.0" have entirely different histories.
master ... 1.0.0

2 changed files with 10 additions and 13 deletions
Show Stats Expand all files Collapse all files

1
composer.json
View File

@ -5,7 +5,6 @@
"keywords": ["laravel", "admin", "grid", "form"],
"homepage": "https://github.com/z-song/laravel-admin",
"license": "MIT",
"version": "1.0.0",
"authors": [
{
"name": "zsong",

8
src/Grid/Displayers/Actions.php
View File

@ -193,7 +193,6 @@ EOT;
$resume_checkout = "<label><input type='checkbox' class='resume_checkout' name='resume_checkout' style='width: 18px;height: 13px;position: relative;top:2px;'>{$tip}</label>";
return $resume_checkout;
}
/**
* Render delete action.
*
@ -202,14 +201,14 @@ EOT;
protected function renderDelete()
{
$title = '';
$url_pams = [];
$url_pams = '';
if(strstr($this->getResource(),'firm/company') && !(strstr($this->getResource(),'firm/companyimg'))&& !(strstr($this->getResource(),'firm/companysetmeal'))) {
$deleteConfirm = trans('admin.delete_company_confirm');
}elseif (strstr($this->getResource(),'personal/members')) {
$deleteConfirm = trans('admin.delete_person_confirm');
} elseif (strstr($this->getResource(),'recycle/index')){
$scope = array_get(request()->all(),'scope',1);
$url_pams['scope'] = $scope;
$url_pams='?scope='.$scope;
$deleteConfirm = trans('admin.delete_confirm');
}elseif (strstr($this->getResource(),'personal/resume')){
$deleteConfirm = trans('admin.delete_confirm');
@ -217,7 +216,6 @@ EOT;
} else {
$deleteConfirm = trans('admin.delete_confirm');
}
$url_pams = empty(http_build_query($url_pams)) ? '' : '&' . http_build_query($url_pams);
$confirm = trans('admin.confirm');
$cancel = trans('admin.cancel');
$script = <<<SCRIPT
@ -241,7 +239,7 @@ function render_action_delete() {
return new Promise(function(resolve) {
$.ajax({
method: 'post',
url: '{$this->getResource()}/' + id +'?is_resume='+is_resume+'{$url_pams}',
url: '{$this->getResource()}/' + id +'$url_pams'+'?is_resume='+is_resume,
data: {
_method:'delete',
_token:LA.token,