cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug-fix-patch18

Browse Source
This commit is contained in:
Manish Verma
2016-11-07 15:35:26 +05:30
parent b64a423626
commit 3c69d5ee9b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -2422,8 +2422,6 @@ class TicketController extends Controller
$new_thread = new Ticket_Thread(); $new_thread = new Ticket_Thread();
$new_thread->ticket_id = $thread->ticket_id; $new_thread->ticket_id = $thread->ticket_id;
$new_thread->user_id = Auth::user()->id; $new_thread->user_id = Auth::user()->id;
$new_thread->poster = $thread->poster;
$new_thread->source = $thread->source;
$new_thread->is_internal = 0; $new_thread->is_internal = 0;
$new_thread->title = $thread->title; $new_thread->title = $thread->title;
$new_thread->body = Lang::get('lang.get_merge_message'). $new_thread->body = Lang::get('lang.get_merge_message').
@@ -2435,8 +2433,6 @@ class TicketController extends Controller
$new_parent_thread = new Ticket_Thread(); $new_parent_thread = new Ticket_Thread();
$new_parent_thread->ticket_id = $p_id; $new_parent_thread->ticket_id = $p_id;
$new_parent_thread->user_id = Auth::user()->id; $new_parent_thread->user_id = Auth::user()->id;
$new_parent_thread->poster = $parent_thread->poster;
$new_parent_thread->source = $parent_thread->source;
$new_parent_thread->is_internal = 1; $new_parent_thread->is_internal = 1;
$new_parent_thread->title = $thread->title; $new_parent_thread->title = $thread->title;
$new_parent_thread->body = Lang::get('lang.ticket')."&nbsp;<a href='".route('ticket.thread', [$value])."'>#".$ticket->ticket_number.'</a>&nbsp'.Lang::get('lang.ticket_merged').'<br><br><b>'.Lang::get('lang.merge-reason').':</b>&nbsp;&nbsp;'.$reason; $new_parent_thread->body = Lang::get('lang.ticket')."&nbsp;<a href='".route('ticket.thread', [$value])."'>#".$ticket->ticket_number.'</a>&nbsp'.Lang::get('lang.ticket_merged').'<br><br><b>'.Lang::get('lang.merge-reason').':</b>&nbsp;&nbsp;'.$reason;

7
app/Model/helpdesk/Ticket/Ticket_attachments.php
View File

@@ -16,6 +16,13 @@ class Ticket_attachments extends Model
$this->attributes['file'] = base64_encode($value); $this->attributes['file'] = base64_encode($value);
} }
public function getFileAttribute($value)
{
if (base64_decode($value, true) === false) {
$value = base64_encode($value);
}
return $value;
}
public function getFile() public function getFile()
{ {
$size = $this->size; $size = $this->size;