Skip to content

Commit 518be2e

Browse files
committed
agent as user on create ticket: hide "visible" field. As agent: select first agent category by default
1 parent dc7bd52 commit 518be2e

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

src/Controllers/TicketsController.php

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -567,12 +567,12 @@ public function edit($id){
567567

568568
public function create_edit_data($ticket = false)
569569
{
570-
$user = $this->member->find(auth()->user()->id);
570+
$member = $this->member->find(auth()->user()->id);
571571

572-
if ($user->currentLevel() > 1){
572+
if ($member->currentLevel() > 1){
573573
$a_owners = Member::with('userDepartment')->orderBy('name')->get();
574574
}else{
575-
$a_owners = Member::whereNull('ticketit_department')->orWhere('id','=',$user->id)->with('userDepartment')->orderBy('name')->get();
575+
$a_owners = Member::whereNull('ticketit_department')->orWhere('id','=',$member->id)->with('userDepartment')->orderBy('name')->get();
576576
}
577577

578578
$priorities = $this->getCacheList('priorities');
@@ -609,21 +609,24 @@ public function create_edit_data($ticket = false)
609609
$a_current['start_date'] = $a_current['limit_date'] = "";
610610

611611
// Default category
612-
$a_current['cat_id'] = @$user->tickets()->latest()->first()->category_id;
613-
614-
if ($a_current['cat_id'] == null){
615-
$a_current['cat_id'] = $user->getNewTicketCategories()->keys()->first();
612+
if ($member->currentLevel() > 1){
613+
$a_current['cat_id'] = @$member->categories()->get()->first()->id;
614+
if ($a_current['cat_id'] == null){
615+
$a_current['cat_id'] = $member->getNewTicketCategories()->keys()->first();
616+
}
617+
}else{
618+
$a_current['cat_id'] = Category::orderBy('name')->first()->id;
616619
}
617-
620+
618621
// Default agent
619-
$a_current['agent_id'] = $user->id;
622+
$a_current['agent_id'] = $member->id;
620623
}
621624

622625
// Agent list
623626
$agent_lists = $this->agentList($a_current['cat_id']);
624627

625628
// Permission level for category
626-
$permission_level = $user->levelInCategory($a_current['cat_id']);
629+
$permission_level = $member->levelInCategory($a_current['cat_id']);
627630

628631
// Current default status
629632
if (!$ticket){

src/Views/tickets/createedit.blade.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@
7272
</div>
7373

7474
@if ($u->currentLevel() > 1)
75-
<div class="form-group">
76-
<label class="col-lg-3 control-label tooltip-info" title="{{ trans('panichd::lang.create-ticket-visible-help') }}">{{ trans('panichd::lang.create-ticket-visible') . trans('panichd::lang.colon') }} <span class="glyphicon glyphicon-question-sign" style="color: #bbb"></span></label>
77-
78-
<div class="col-lg-9" style="padding-top: 7px;">
79-
<label><input type="radio" name="hidden" value="false" {{ (!isset($ticket) || (isset($ticket) && !$ticket->hidden)) ? 'checked' : '' }}> {{ trans('panichd::lang.yes') }}</label><label style="margin: 0em 0em 0em 1em;"><input type="radio" name="hidden" value="true" {{ (isset($ticket) && $ticket->hidden) ? 'checked' : ''}}> {{ trans('panichd::lang.no') }}</label>
80-
</div>
81-
82-
</div>
83-
8475
<div class="jquery_level2_show">
76+
<div class="form-group">
77+
<label class="col-lg-3 control-label tooltip-info" title="{{ trans('panichd::lang.create-ticket-visible-help') }}">{{ trans('panichd::lang.create-ticket-visible') . trans('panichd::lang.colon') }} <span class="glyphicon glyphicon-question-sign" style="color: #bbb"></span></label>
78+
79+
<div class="col-lg-9" style="padding-top: 7px;">
80+
<label><input type="radio" name="hidden" value="false" {{ (!isset($ticket) || (isset($ticket) && !$ticket->hidden)) ? 'checked' : '' }}> {{ trans('panichd::lang.yes') }}</label><label style="margin: 0em 0em 0em 1em;"><input type="radio" name="hidden" value="true" {{ (isset($ticket) && $ticket->hidden) ? 'checked' : ''}}> {{ trans('panichd::lang.no') }}</label>
81+
</div>
82+
83+
</div>
84+
8585
<div class="form-group" style="margin-bottom: 3em"><!-- TICKET LIST -->
8686
{!! CollectiveForm::label('status_id', trans('panichd::lang.list') . trans('panichd::lang.colon'), [
8787
'class' => 'col-lg-3 control-label'

0 commit comments

Comments
 (0)