Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bugg

This commit is contained in:
Manish Verma
2016-10-28 13:19:10 +05:30
2 changed files with 1 additions and 1 deletions

View File

@@ -1258,6 +1258,7 @@ class="active"
setInterval(function () { setInterval(function () {
$("#alert-success").hide(); $("#alert-success").hide();
}, 4000); }, 4000);
window.location.reload(true);
} }
if (response == 0) { if (response == 0) {

View File

@@ -415,7 +415,6 @@
{{-- < li id = "bar" @yield('overdue') > < a href = "{{ url('/ticket/overdue') }}" >Overdue</a></li> --}} {{-- < li id = "bar" @yield('overdue') > < a href = "{{ url('/ticket/overdue') }}" >Overdue</a></li> --}}
<li id="bar" @yield('assigned')><a href="{{ url('/ticket/assigned')}}" id="load-assigned" >{!! Lang::get('lang.assigned') !!}</a></li> <li id="bar" @yield('assigned')><a href="{{ url('/ticket/assigned')}}" id="load-assigned" >{!! Lang::get('lang.assigned') !!}</a></li>
<li id="bar" @yield('approvel')><a href="{{ url('ticket/approval/closed')}}" >{!! Lang::get('lang.approval') !!}</a></li>
<li id="bar" @yield('closed')><a href="{{ url('/ticket/closed')}}" >{!! Lang::get('lang.closed') !!}</a></li> <li id="bar" @yield('closed')><a href="{{ url('/ticket/closed')}}" >{!! Lang::get('lang.closed') !!}</a></li>
<?php if ($group->can_create_ticket == 1) { ?> <?php if ($group->can_create_ticket == 1) { ?>
<li id="bar" @yield('newticket')><a href="{{ url('/newticket')}}" >{!! Lang::get('lang.create_ticket') !!}</a></li> <li id="bar" @yield('newticket')><a href="{{ url('/newticket')}}" >{!! Lang::get('lang.create_ticket') !!}</a></li>