libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #2530 from stianst/KEYCLOAK-2761

Browse source 
KEYCLOAK-2761 Broken on/off switch at Client Mappers with specific wi…
This commit is contained in:
Stian Thorgersen 2016-04-07 07:13:35 +02:00
commit f585f5dfc9
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html
View file

@ -26,7 +26,7 @@
<kc-tooltip>{{:: 'mapper.name.tooltip' | translate}}</kc-tooltip> <kc-tooltip>{{:: 'mapper.name.tooltip' | translate}}</kc-tooltip>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="consentRequired" class="col-sm-2 control-label">{{:: 'consent-required' | translate}}</label> <label for="consentRequired" class="col-md-2 control-label">{{:: 'consent-required' | translate}}</label>
<div class="col-md-6"> <div class="col-md-6">
<input ng-model="model.mapper.consentRequired" name="consentRequired" id="consentRequired" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" /> <input ng-model="model.mapper.consentRequired" name="consentRequired" id="consentRequired" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
</div> </div>
@ -42,7 +42,7 @@
</div> </div>
<div class="form-group" data-ng-show="model.create"> <div class="form-group" data-ng-show="model.create">
<label class="col-md-2 control-label" for="mapperTypeCreate">{{:: 'mapper-type' | translate}}</label> <label class="col-md-2 control-label" for="mapperTypeCreate">{{:: 'mapper-type' | translate}}</label>
<div class="col-sm-6"> <div class="col-md-6">
<div> <div>
<select class="form-control" id="mapperTypeCreate" <select class="form-control" id="mapperTypeCreate"
ng-model="model.mapperType" ng-model="model.mapperType"

16
themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html
View file

@ -2,31 +2,31 @@
<div data-ng-repeat="option in properties" class="form-group" data-ng-controller="ProviderConfigCtrl"> <div data-ng-repeat="option in properties" class="form-group" data-ng-controller="ProviderConfigCtrl">
<label class="col-md-2 control-label">{{:: option.label | translate}}</label> <label class="col-md-2 control-label">{{:: option.label | translate}}</label>
<div class="col-sm-6" data-ng-hide="option.type == 'boolean' || option.type == 'List' || option.type == 'Role' || option.type == 'ClientList' || option.type == 'Password'"> <div class="col-md-6" data-ng-hide="option.type == 'boolean' || option.type == 'List' || option.type == 'Role' || option.type == 'ClientList' || option.type == 'Password'">
<input class="form-control" type="text" data-ng-model="config[ option.name ]" > <input class="form-control" type="text" data-ng-model="config[ option.name ]" >
</div> </div>
<div class="col-sm-6" data-ng-show="option.type == 'Password'"> <div class="col-md-6" data-ng-show="option.type == 'Password'">
<input class="form-control" type="password" data-ng-model="config[ option.name ]" > <input class="form-control" type="password" data-ng-model="config[ option.name ]" >
</div> </div>
<div class="col-sm-6" data-ng-show="option.type == 'boolean'"> <div class="col-md-6" data-ng-show="option.type == 'boolean'">
<input ng-model="config[ option.name ]" value="'true'" name="option.name" id="option.name" onoffswitchstring on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}"/> <input ng-model="config[ option.name ]" value="'true'" name="option.name" id="option.name" onoffswitchstring on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}"/>
</div> </div>
<div class="col-sm-6" data-ng-show="option.type == 'List'"> <div class="col-md-6" data-ng-show="option.type == 'List'">
<select ng-model="config[ option.name ]" ng-options="data for data in option.defaultValue"> <select ng-model="config[ option.name ]" ng-options="data for data in option.defaultValue">
<option value="" selected> {{:: 'selectOne' | translate}} </option> <option value="" selected> {{:: 'selectOne' | translate}} </option>
</select> </select>
</div> </div>
<div class="col-sm-6" data-ng-show="option.type == 'Role'"> <div class="col-md-6" data-ng-show="option.type == 'Role'">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-md-8">
<input class="form-control" type="text" data-ng-model="config[ option.name ]" > <input class="form-control" type="text" data-ng-model="config[ option.name ]" >
</div> </div>
<div class="col-sm-2"> <div class="col-md-2">
<button type="submit" data-ng-click="openRoleSelector(option.name, config)" class="btn btn-default" tooltip-placement="top" tooltip-trigger="mouseover mouseout" tooltip="{{:: 'selectRole.tooltip' | translate}}">{{:: 'selectRole.label' | translate}}</button> <button type="submit" data-ng-click="openRoleSelector(option.name, config)" class="btn btn-default" tooltip-placement="top" tooltip-trigger="mouseover mouseout" tooltip="{{:: 'selectRole.tooltip' | translate}}">{{:: 'selectRole.label' | translate}}</button>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-4" data-ng-show="option.type == 'ClientList'"> <div class="col-md-4" data-ng-show="option.type == 'ClientList'">
<select ng-model="config[ option.name ]" ng-options="client.clientId as client.clientId for client in clients"> <select ng-model="config[ option.name ]" ng-options="client.clientId as client.clientId for client in clients">
<option value="" selected> {{:: 'selectOne' | translate}} </option> <option value="" selected> {{:: 'selectOne' | translate}} </option>
</select> </select>