hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #106: (feature/zy -> develop)

Browse Source 
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/106
This commit is contained in:
zhuyu 2025-06-04 10:08:59 +08:00 committed by Coding
commit 9fefc01a25
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/admin/controller/auth/Admin.php
View File

@ -30,6 +30,8 @@ class Admin extends Backend
protected $childrenGroupIds = [];
protected $childrenAdminIds = [];
protected $noNeedRight = ['norightselectpage'];
public function _initialize()
{
parent::_initialize();
@ -358,4 +360,10 @@ class Admin extends Backend
}
$this->success();
}
public function norightselectpage()
{
$this->dataLimit = null;
return parent::selectpage();
}
}

2
application/admin/controller/salary/CustomDetail.php
View File

@ -91,7 +91,7 @@ class CustomDetail extends Backend
$builder = $this->model
->where('salary_month', '=', $month);
if (!$this->auth->isSuperAdmin()) {
if (!$this->auth->check('salary/custom_detail/edit')) {
$builder = $builder->where('target_admin_id', $this->auth->id);
}

2
application/admin/view/oa/custom_schedule/add.html
View File

@ -3,7 +3,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Exec_admin_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="">
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/norightselectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="">
</div>
</div>
<div class="form-group">

2
application/admin/view/oa/custom_schedule/edit.html
View File

@ -3,7 +3,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Exec_admin_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="{$row.exec_admin_id|htmlentities}">
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/norightselectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="{$row.exec_admin_id|htmlentities}">
</div>
</div>
<div class="form-group">

2
application/admin/view/salary/custom_detail/add.html
View File

@ -3,7 +3,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Target_admin_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-target_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[target_admin_id]" type="text" value="">
<input id="c-target_admin_id" data-rule="required" data-source="auth/admin/norightselectpage" data-field="nickname" class="form-control selectpage" name="row[target_admin_id]" type="text" value="">
</div>
</div>
<div class="form-group">

2
application/admin/view/salary/custom_detail/edit.html
View File

@ -3,7 +3,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Target_admin_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-target_admin_id" readonly="readonly" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[target_admin_id]" type="text" value="{$row.target_admin_id|htmlentities}">
<input id="c-target_admin_id" readonly="readonly" data-rule="required" data-source="auth/admin/norightselectpage" data-field="nickname" class="form-control selectpage" name="row[target_admin_id]" type="text" value="{$row.target_admin_id|htmlentities}">
</div>
</div>
<div class="form-group">