切换导航条
此项目
正在载入...
登录
何书鹏
/
recruit
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
Karson
5 years ago
提交
e550b327ddc1d6ae2c1126490dcb5c811978624a
1 个父辈
82fc4f97
优化会员列表显示
优化个人资料列表显示 优化基类模型
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
13 行增加
和
10 行删除
application/admin/controller/general/Profile.php
application/admin/view/user/user/index.html
application/common/controller/Backend.php
application/admin/controller/general/Profile.php
查看文件 @
e550b32
...
...
@@ -24,10 +24,10 @@ class Profile extends Backend
//设置过滤方法
$this
->
request
->
filter
([
'strip_tags'
,
'trim'
]);
if
(
$this
->
request
->
isAjax
())
{
$model
=
model
(
'AdminLog'
);
$
this
->
model
=
model
(
'AdminLog'
);
list
(
$where
,
$sort
,
$order
,
$offset
,
$limit
)
=
$this
->
buildparams
();
$list
=
$model
$list
=
$
this
->
model
->
where
(
$where
)
->
where
(
'admin_id'
,
$this
->
auth
->
id
)
->
order
(
$sort
,
$order
)
...
...
application/admin/view/user/user/index.html
查看文件 @
e550b32
...
...
@@ -15,9 +15,9 @@
</ul>
</div>
</div>
<table
id=
"table"
class=
"table table-striped table-bordered table-hover"
data-operate-edit=
"{:$auth->check('user/user/edit')}"
data-operate-del=
"{:$auth->check('user/user/del')}"
<table
id=
"table"
class=
"table table-striped table-bordered table-hover table-nowrap"
data-operate-edit=
"{:$auth->check('user/user/edit')}"
data-operate-del=
"{:$auth->check('user/user/del')}"
width=
"100%"
>
</table>
</div>
...
...
application/common/controller/Backend.php
查看文件 @
e550b32
...
...
@@ -388,7 +388,7 @@ class Backend extends Controller
$arr
=
$arr
[
0
];
}
$tableArr
=
explode
(
'.'
,
$k
);
if
(
count
(
$tableArr
)
>
1
&&
$tableArr
[
0
]
!=
$name
&&
!
in_array
(
$tableArr
[
0
],
$alias
))
{
if
(
count
(
$tableArr
)
>
1
&&
$tableArr
[
0
]
!=
$name
&&
!
in_array
(
$tableArr
[
0
],
$alias
)
&&
!
empty
(
$this
->
model
)
)
{
//修复关联模型下时间无法搜索的BUG
$relation
=
Loader
::
parseName
(
$tableArr
[
0
],
1
,
false
);
$alias
[
$this
->
model
->
$relation
()
->
getTable
()]
=
$tableArr
[
0
];
...
...
@@ -406,12 +406,15 @@ class Backend extends Controller
}
$index
++
;
}
$this
->
model
->
alias
(
$alias
);
if
(
!
empty
(
$this
->
model
))
{
$this
->
model
->
alias
(
$alias
);
}
$model
=
$this
->
model
;
$where
=
function
(
$query
)
use
(
$where
,
$alias
,
$bind
,
&
$model
)
{
$model
->
alias
(
$alias
);
$model
->
bind
(
$bind
);
if
(
!
empty
(
$model
))
{
$model
->
alias
(
$alias
);
$model
->
bind
(
$bind
);
}
foreach
(
$where
as
$k
=>
$v
)
{
if
(
is_array
(
$v
))
{
call_user_func_array
([
$query
,
'where'
],
$v
);
...
...
请
注册
或
登录
后发表评论