mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-04-17 19:58:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/469-call-forwarding-redirect' into 'master'

Browse source 
Fix FLEXIAPI-469 Simply redirect back when saving the Call Forwardings

Closes FLEXIAPI-469

See merge request BC/public/flexisip-account-manager!681
This commit is contained in:
Timothée Jaussoin 2026-04-14 14:19:58 +00:00
commit 69c490dfdf
4 changed files with 247 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -3,7 +3,7 @@ variables:
ROCKY_9_IMAGE_VERSION: 20250702_171314_update_rocky9_dockerhub
ROCKY_10_IMAGE_VERSION: 20250908_164454_rocky10_first
DEBIAN_12_IMAGE_VERSION: 20250908_154742_refresh_dependencies
DEBIAN_13_IMAGE_VERSION: 20260204_090147_update_packages
DEBIAN_13_IMAGE_VERSION: 20260414_154832_update_packages
PHP_REDIS_REMI_VERSION: php-pecl-redis6-6.1.0-1
PHP_IGBINARY_REMI_VERSION: php-pecl-igbinary-3.2.16-2
PHP_MSGPACK_REMI_VERSION: php-pecl-msgpack-2.2.0-3

4
flexiapi/app/Http/Controllers/Admin/Account/CallForwardingController.php
View file

@ -79,8 +79,6 @@ class CallForwardingController extends Controller
$busyForwarding->save();
}
return $request->user()
? redirect()->route('admin.account.telephony.show', $account)
: redirect()->route('account.telephony');
return redirect()->back();
}
}

484
flexiapi/composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
flexiapi/resources/views/parts/sidebar.blade.php
View file

@ -14,4 +14,6 @@
$items['admin.api_keys.index'] = ['title' => __('Settings'), 'icon' => 'gear'];
}
@endphp
@include('parts.sidebar_items', ['items' => $items])
</nav>