Skip to content
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.

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

Fixing ignore. #5867

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "encore/laravel-admin",
"name": "lmkhang10/laravel-admin",
"description": "laravel admin",
"type": "library",
"keywords": ["laravel", "admin", "grid", "form"],
Expand Down
2 changes: 1 addition & 1 deletion docs/en/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ First, install laravel, and make sure that the database connection settings are

Then install require this package with command:
```
composer require encore/laravel-admin "1.5.*"
composer require lmkhang10/laravel-admin "1.0.*"
```

Publish assets and config with command:
Expand Down
4 changes: 2 additions & 2 deletions docs/zh/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
首先确保安装好了`laravel`,并且数据库连接设置正确。

```
composer require encore/laravel-admin "1.5.*"
composer require lmkhang10/laravel-admin "1.0.*"
```

然后运行下面的命令来发布资源:
Expand Down Expand Up @@ -51,4 +51,4 @@ app/Admin

### 静态文件

后台所需的前端静态文件在`/public/vendor/laravel-admin`目录下.
后台所需的前端静态文件在`/public/vendor/laravel-admin`目录下.
6 changes: 3 additions & 3 deletions docs/zh/qa.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

如果有需要自己修改view,但是不方便直接修改`laravel-admin`的情况,可以用下面的办法解决

复制`vendor/encore/laravel-admin/views`到项目的`resources/views/admin`,然后在`app/Admin/bootstrap.php`文件中加入代码:
复制`vendor/lmkhang10/laravel-admin/views`到项目的`resources/views/admin`,然后在`app/Admin/bootstrap.php`文件中加入代码:

```php
app('view')->prependNamespace('admin', resource_path('views/admin'));
```

这样就用`resources/views/admin`下的视图覆盖了`laravel-admin`的视图,要注意的问题是,更新`laravel-admin`的时候,如果遇到视图方面的问题,需要重新复制`vendor/encore/laravel-admin/views`到项目的`resources/views/admin`中,注意备份原来已经修改过的视图。
这样就用`resources/views/admin`下的视图覆盖了`laravel-admin`的视图,要注意的问题是,更新`laravel-admin`的时候,如果遇到视图方面的问题,需要重新复制`vendor/lmkhang10/laravel-admin/views`到项目的`resources/views/admin`中,注意备份原来已经修改过的视图。

## 设置语言

Expand Down Expand Up @@ -56,4 +56,4 @@ Route::group([

## 更新静态资源

如果遇到更新之后,部分组件不能正常使用,那有可能是`laravel-admin`自带的静态资源有更新了,需要运行命令`php artisan vendor:publish --tag=laravel-admin-assets --force`来重新发布前端资源,发布之后不要忘记清理浏览器缓存.
如果遇到更新之后,部分组件不能正常使用,那有可能是`laravel-admin`自带的静态资源有更新了,需要运行命令`php artisan vendor:publish --tag=laravel-admin-assets --force`来重新发布前端资源,发布之后不要忘记清理浏览器缓存.
2 changes: 1 addition & 1 deletion src/Console/ConfigCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function handle()
$this->printDiff('Removed', $removed, true);

$this->line('');
$this->comment('Please open `vendor/encore/laravel-admin/config/admin.php` to check the difference');
$this->comment('Please open `vendor/lmkhang10/laravel-admin/config/admin.php` to check the difference');
}

protected function diff(array $from, array $to)
Expand Down
2 changes: 1 addition & 1 deletion src/Console/stubs/extension/composer.json.stub
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"require": {
"php": ">=7.0.0",
"encore/laravel-admin": "~1.6"
"lmkhang10/laravel-admin": "~1.0.0"
},
"require-dev": {
"phpunit/phpunit": "~6.0"
Expand Down
3 changes: 3 additions & 0 deletions src/Grid/Filter/AbstractFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,9 @@ public function getValue()
*/
protected function buildCondition()
{
if ($this->ignore) {
return;
}
$column = explode('.', $this->column);

if (count($column) == 1) {
Expand Down