Skip to content

[OPALSUP-291] Language setting issue #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 2.0
Choose a base branch
from
Open

[OPALSUP-291] Language setting issue #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0866a7c
[OPALSUP-291] Allow organization ID storage to not be restricted by s…
Sep 4, 2018
2439685
Fix incorrect key being cleared from cookies when refreshing org data
Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/components/dashboard-apps-dock/dashboard-apps-dock.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

DashboardAppsDockCtrl = ($scope, $cookies, $uibModal, $window, MnoeOrganizations, MnoeAppInstances, MnoeProductInstances, MnoeConfig) ->
DashboardAppsDockCtrl = ($scope, $uibModal, $window, MnoeOrganizations, MnoeAppInstances, MnoeProductInstances, MnoeConfig) ->
'ngInject'

$scope.appDock = {}
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/mnoe-api/organizations.svc.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ angular.module 'mnoEnterpriseAngular'

@reloadCurrentOrganization = () ->
orgId = _self.selectedId
$cookies.remove("#{orgId}_dhb_ref_id")
$cookies.remove("#{MnoeCurrentUser.user.id}_dhb_ref_id")
organizationPromise = null
_self.selectedId = null
MnoeCurrentUser.refresh().then(
Expand All @@ -51,7 +51,7 @@ angular.module 'mnoEnterpriseAngular'
MnoeApiSvc.one('/organizations', _self.selectedId).get().then(
(responseOrga) ->
# Use user id to avoid another user to load with an unknown organisation
$cookies.put("#{response.id}_dhb_ref_id", responseOrga.organization.id)
$cookies.put("#{response.id}_dhb_ref_id", responseOrga.organization.id, { path: '/' })

# Save the organization in the service
_self.selected = responseOrga.plain()
Expand Down