libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Vlasta Ramik 2015-10-12 15:35:04 +02:00
commit 217c359530
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
View file

@ -1711,6 +1711,10 @@ module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flo
} }
} }
$scope.selectFlow = function(flow) {
$location.url("/realms/" + realm.realm + '/authentication/flows/' + flow.alias);
};
var setupForm = function() { var setupForm = function() {
AuthenticationFlowExecutions.query({realm: realm.realm, alias: $scope.flow.alias}, function(data) { AuthenticationFlowExecutions.query({realm: realm.realm, alias: $scope.flow.alias}, function(data) {
$scope.executions = data; $scope.executions = data;
@ -1745,7 +1749,6 @@ module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flo
execution.postLevels.push(j); execution.postLevels.push(j);
} }
} }
$location.url("/realms/" + realm.realm + "/authentication/flows/" + $scope.flow.alias);
}) })
}; };
@ -1831,9 +1834,11 @@ module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flo
$scope.setupForm = setupForm; $scope.setupForm = setupForm;
setupForm(); if (selectedFlow == null) {
$scope.selectFlow(flows[0]);
} else {
setupForm();
}
}); });
module.controller('RequiredActionsCtrl', function($scope, realm, unregisteredRequiredActions, module.controller('RequiredActionsCtrl', function($scope, realm, unregisteredRequiredActions,

2
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/authentication-flows.html
View file

@ -10,7 +10,7 @@
<div class="dropdown pull-left"> <div class="dropdown pull-left">
<select class="form-control" ng-model="flow" <select class="form-control" ng-model="flow"
ng-options="(flow.alias|capitalize) for flow in flows" ng-options="(flow.alias|capitalize) for flow in flows"
data-ng-change="setupForm()"> data-ng-change="selectFlow(flow)">
</select> </select>
</div> </div>
&nbsp;&nbsp;<i class="fa fa-question-circle text-muted" tooltip-trigger="mouseover mouseout" tooltip="{{flow.description}}" tooltip-placement="right"> </i> &nbsp;&nbsp;<i class="fa fa-question-circle text-muted" tooltip-trigger="mouseover mouseout" tooltip="{{flow.description}}" tooltip-placement="right"> </i>