Merge remote-tracking branch 'origin/master'

Karson
application/admin/command/Crud/stubs/html/recyclebin-html.stub
--- a/application/admin/command/Crud/stubs/html/recyclebin-html.stub
查看文件 @9e8fc90
+++ b/application/admin/command/Crud/stubs/html/recyclebin-html.stub
查看文件 @9e8fc90
- <a class="btn btn-success btn-recyclebin btn-dialog" href="{%controllerUrl%}/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
\ No newline at end of file
+ <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('{%controllerUrl%}/recyclebin')?'':'hide'}" href="{%controllerUrl%}/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
\ No newline at end of file