git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/auth-portlet-manager@133330 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
f7b496c909
commit
d3f98bed78
4
pom.xml
4
pom.xml
|
@ -168,12 +168,12 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>common-authorization</artifactId>
|
||||
<scope> compile</scope>
|
||||
<!-- <scope> compile</scope> -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>authorization-client</artifactId>
|
||||
<scope> compile</scope>
|
||||
<!-- <scope> compile</scope> -->
|
||||
</dependency>
|
||||
<!-- End Authorization Client -->
|
||||
</dependencies>
|
||||
|
|
|
@ -147,9 +147,12 @@ public class PolicyAddDialog extends WindowBox {
|
|||
Collections.sort(sortedServiceName);
|
||||
//filter distinct service
|
||||
List<String> distinctServiceName = new ArrayList<String>();
|
||||
l_service_name_policy.addItem(ConstantsSharing.StarLabel,ConstantsSharing.Star);
|
||||
for (String serviceName :sortedServiceName )
|
||||
{
|
||||
|
||||
if (!distinctServiceName.contains(serviceName)){
|
||||
|
||||
l_service_name_policy.addItem(serviceName);
|
||||
distinctServiceName.add(serviceName);
|
||||
}
|
||||
|
@ -164,8 +167,8 @@ public class PolicyAddDialog extends WindowBox {
|
|||
tourAddDialogPolicy.setShowPrevButton(true);
|
||||
if (!this.modifyPolicy){
|
||||
TourStep firstStep = new TourStep(Placement.RIGHT, "idAddCallerPolicy");
|
||||
firstStep.setContent("Here you can add a single or multiple caller to deny access on a selected service:"
|
||||
+ "<br>If insert an user digit @,<br>If insert a role digit #, <br>If you want insert a service digit $.");
|
||||
firstStep.setContent("A single or multiple caller can be added to deny access on a selected service:"
|
||||
+ "<br>To insert a user digit @,<br>To insert a role digit #, <br>To insert a service digit $.");
|
||||
firstStep.setTitle("Add Caller");
|
||||
firstStep.centerXOffset();
|
||||
firstStep.centerArrowOffset();
|
||||
|
@ -428,22 +431,27 @@ public class PolicyAddDialog extends WindowBox {
|
|||
b_add_multiple_user_role.setEnabled(false);
|
||||
b_add_multiple_service.setEnabled(false);
|
||||
//RETRIVE A SERVICE SELECT
|
||||
l_service_name_policy.addItem("ALL");
|
||||
|
||||
GWT.log("access:"+serviceClass);
|
||||
if (!serviceClass.equals("ALL")){
|
||||
|
||||
if (!serviceClass.equals(ConstantsSharing.Star)){
|
||||
List<String> distinctServiceName = new ArrayList<String>();
|
||||
//l_service_name_policy.addItem(ConstantsSharing.StarLabel,ConstantsSharing.Star);
|
||||
for (String serviceNameList : Entities.getServicesMap().get(serviceClass)){
|
||||
if (!distinctServiceName.contains(serviceNameList)){
|
||||
l_service_name_policy.addItem(serviceNameList);
|
||||
distinctServiceName.add(serviceNameList);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//selected the values of policy
|
||||
l_service_class_policy.setSelectedValue(serviceClass);
|
||||
l_service_name_policy.setSelectedValue(serviceName);
|
||||
l_service_id_policy.setSelectedValue(serviceId);
|
||||
}
|
||||
l_access_policy.setSelectedValue(access.toString());
|
||||
l_service_name_policy.setEnabled(true);
|
||||
}
|
||||
/**
|
||||
* Retrieve information from dialog multiple caller
|
||||
|
|
|
@ -75,11 +75,11 @@
|
|||
placeholder="click for search" b:id="t_search" ui:field="t_search" />
|
||||
</b:Popover>
|
||||
<b:ButtonGroup toggle="radio" ui:field="b_search_type">
|
||||
<b:Tooltip text='Search Starts With'>
|
||||
<b:Tooltip text='starts With'>
|
||||
<b:Button addStyleNames="btn {style.btn_search_start}"
|
||||
ui:field="b_search_start" active="true" />
|
||||
</b:Tooltip>
|
||||
<b:Tooltip text='Search Container'>
|
||||
<b:Tooltip text='contains'>
|
||||
<b:Button addStyleNames="btn {style.btn_search_contains}"
|
||||
ui:field="b_search_contains" />
|
||||
</b:Tooltip>
|
||||
|
@ -92,22 +92,22 @@
|
|||
|
||||
|
||||
<b:ButtonGroup toggle="radio" b:id="idGroupPolicy">
|
||||
<b:Tooltip text='Select All Caller'>
|
||||
<b:Tooltip text='All'>
|
||||
<b:Button addStyleNames="btn btn_group_none" ui:field="b_group_none"
|
||||
active="true" />
|
||||
</b:Tooltip>
|
||||
<b:Tooltip text='Caller Group by User'>
|
||||
<b:Tooltip text='Only Users'>
|
||||
<b:Button addStyleNames="btn btn_group_user" ui:field="b_group_user" />
|
||||
</b:Tooltip>
|
||||
<b:Tooltip text='Caller Group by Role'>
|
||||
<b:Tooltip text='Only Roles'>
|
||||
<b:Button addStyleNames="btn btn_group_role" ui:field="b_group_role" />
|
||||
</b:Tooltip>
|
||||
<b:Tooltip text='Caller Group by Service'>
|
||||
<b:Tooltip text='Only Services'>
|
||||
<b:Button addStyleNames="btn btn_group_service"
|
||||
ui:field="b_group_service" />
|
||||
</b:Tooltip>
|
||||
</b:ButtonGroup>
|
||||
<b:Tooltip text='Refresh List Policy'>
|
||||
<b:Tooltip text='Refresh List'>
|
||||
<b:Button addStyleNames="btn btn_refresh" ui:field="b_refresh" />
|
||||
</b:Tooltip>
|
||||
<span styleName="{style.label_wizard_policy}">
|
||||
|
|
Loading…
Reference in New Issue