Author: ilgrosso
Date: Wed Jul 2 15:58:53 2014
New Revision: 1607404
URL: http://svn.apache.org/r1607404
Log:
[SYNCOPE-520] New action for ActionLinksPanel
Added:
syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png
(with props)
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
(original)
+++
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Resources.java
Wed Jul 2 15:58:53 2014
@@ -228,6 +228,28 @@ public class Resources extends BasePage
@Override
public void onClick(final AjaxRequestTarget target) {
+ resourceTO.setUsyncToken(null);
+ resourceTO.setRsyncToken(null);
+ try {
+ resourceRestClient.update(resourceTO);
+ info(getString(Constants.OPERATION_SUCCEEDED));
+ } catch (SyncopeClientCompositeErrorException e) {
+ error(getString(Constants.ERROR) + ":" +
e.getMessage());
+
+ LOG.error("While resetting sync token from " +
resourceTO.getName(), e);
+ }
+
+ target.add(feedbackPanel);
+ target.add(resourceContainer);
+ }
+ }, ActionLink.ActionType.RESET, "Resources");
+
+ panel.add(new ActionLink() {
+
+ private static final long serialVersionUID =
-3722207913631435501L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
editResourceWin.setPageCreator(new
ModalWindow.PageCreator() {
private static final long serialVersionUID =
-7834632442532690940L;
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java
(original)
+++
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java
Wed Jul 2 15:58:53 2014
@@ -38,7 +38,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
@@ -52,7 +51,7 @@ public class ResourceDetailsPanel extend
/**
* Logger.
*/
- protected static final Logger LOG =
LoggerFactory.getLogger(ResourceDetailsPanel.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(ResourceDetailsPanel.class);
@SpringBean
private ConnectorRestClient connRestClient;
@@ -79,12 +78,12 @@ public class ResourceDetailsPanel extend
final AjaxCheckBoxPanel propagationPrimary = new
AjaxCheckBoxPanel("propagationPrimary", new ResourceModel(
"propagationPrimary", "propagationPrimary").getObject(), new
PropertyModel<Boolean>(resourceTO,
- "propagationPrimary"));
+ "propagationPrimary"));
add(propagationPrimary);
final AjaxNumberFieldPanel propagationPriority = new
AjaxNumberFieldPanel("propagationPriority",
new ResourceModel("propagationPriority",
"propagationPriority").getObject(), new PropertyModel<Number>(
- resourceTO, "propagationPriority"), Integer.class);
+ resourceTO, "propagationPriority"), Integer.class);
add(propagationPriority);
final AjaxDropDownChoicePanel<PropagationMode> propagationMode = new
AjaxDropDownChoicePanel<PropagationMode>(
@@ -129,23 +128,6 @@ public class ResourceDetailsPanel extend
syncTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
add(syncTraceLevel);
- final AjaxCheckBoxPanel resetToken = new
AjaxCheckBoxPanel("resetToken", new ResourceModel("resetToken",
- "resetToken").getObject(), new Model<Boolean>(null));
-
- resetToken.getField().add(new
AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
-
- private static final long serialVersionUID = -1107858522700306810L;
-
- @Override
- protected void onUpdate(final AjaxRequestTarget art) {
- if (resetToken.getModelObject()) {
- resourceTO.setUsyncToken(null);
- resourceTO.setRsyncToken(null);
- }
- }
- });
- add(resetToken);
-
final IModel<List<ConnInstanceTO>> connectors = new
LoadableDetachableModel<List<ConnInstanceTO>>() {
private static final long serialVersionUID = 5275935387613157437L;
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
(original)
+++
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
Wed Jul 2 15:58:53 2014
@@ -31,6 +31,7 @@ public abstract class ActionLink impleme
EDIT("read"),
USER_TEMPLATE("read"),
ROLE_TEMPLATE("read"),
+ RESET("update"),
ENABLE("update"),
SEARCH("read"),
DELETE("delete"),
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
(original)
+++
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
Wed Jul 2 15:58:53 2014
@@ -51,6 +51,7 @@ public class ActionLinksPanel extends Pa
super.add(new Fragment("panelClaim", "emptyFragment", this));
super.add(new Fragment("panelCreate", "emptyFragment", this));
super.add(new Fragment("panelEdit", "emptyFragment", this));
+ super.add(new Fragment("panelReset", "emptyFragment", this));
super.add(new Fragment("panelUserTemplate", "emptyFragment", this));
super.add(new Fragment("panelRoleTemplate", "emptyFragment", this));
super.add(new Fragment("panelEnable", "emptyFragment", this));
@@ -99,7 +100,7 @@ public class ActionLinksPanel extends Pa
case CLAIM:
fragment = new Fragment("panelClaim", "fragmentClaim", this);
- fragment.addOrReplace(new ClearIndicatingAjaxLink("claimLink",
pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("claimLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -113,7 +114,7 @@ public class ActionLinksPanel extends Pa
case CREATE:
fragment = new Fragment("panelCreate", "fragmentCreate", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("createLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("createLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -124,10 +125,24 @@ public class ActionLinksPanel extends Pa
});
break;
+ case RESET:
+ fragment = new Fragment("panelReset", "fragmentReset", this);
+
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("resetLink", pageRef) {
+
+ private static final long serialVersionUID =
-6957616042924610290L;
+
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget
target) {
+ link.onClick(target);
+ }
+ });
+ break;
+
case EDIT:
fragment = new Fragment("panelEdit", "fragmentEdit", this);
- fragment.addOrReplace(new ClearIndicatingAjaxLink("editLink",
pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("editLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -141,7 +156,7 @@ public class ActionLinksPanel extends Pa
case USER_TEMPLATE:
fragment = new Fragment("panelUserTemplate",
"fragmentUserTemplate", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("userTemplateLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("userTemplateLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -155,7 +170,7 @@ public class ActionLinksPanel extends Pa
case ROLE_TEMPLATE:
fragment = new Fragment("panelRoleTemplate",
"fragmentRoleTemplate", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("roleTemplateLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("roleTemplateLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -169,7 +184,7 @@ public class ActionLinksPanel extends Pa
case ENABLE:
fragment = new Fragment("panelEnable", "fragmentEnable", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("enableLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("enableLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -183,7 +198,7 @@ public class ActionLinksPanel extends Pa
case SEARCH:
fragment = new Fragment("panelSearch", "fragmentSearch", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("searchLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("searchLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -197,7 +212,7 @@ public class ActionLinksPanel extends Pa
case EXECUTE:
fragment = new Fragment("panelExecute", "fragmentExecute",
this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("executeLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("executeLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -211,7 +226,7 @@ public class ActionLinksPanel extends Pa
case DRYRUN:
fragment = new Fragment("panelDryRun", "fragmentDryRun", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("dryRunLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("dryRunLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -240,7 +255,7 @@ public class ActionLinksPanel extends Pa
case SELECT:
fragment = new Fragment("panelSelect", "fragmentSelect", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("selectLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("selectLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -255,7 +270,7 @@ public class ActionLinksPanel extends Pa
case EXPORT:
fragment = new Fragment("panelExport", "fragmentExport", this);
- fragment.addOrReplace(new
ClearIndicatingAjaxLink("exportLink", pageRef) {
+ fragment.addOrReplace(new
ClearIndicatingAjaxLink<Void>("exportLink", pageRef) {
private static final long serialVersionUID =
-7978723352517770644L;
Modified:
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
(original)
+++
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
Wed Jul 2 15:58:53 2014
@@ -51,7 +51,6 @@ deleteTraceLevel=Delete trace level
syncTraceLevel=Synchronization trace level
propagationPriority=Propagation priority
propagationPrimary=Propagation primary
-resetToken=Reset token
success_connection=Successful connection
error_connection=Connection failure
Modified:
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
(original)
+++
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
Wed Jul 2 15:58:53 2014
@@ -52,7 +52,6 @@ deleteTraceLevel=Livello di tracciamento
syncTraceLevel=Livello di tracciamento delle sincronizzazioni
propagationPriority=Priorit\u00e0 in propagazione
propagationPrimary=Primaria in propagazione
-resetToken=Reset token
success_connection=Connessione avvenuta con successo
error_connection=Connessione non riuscita
Modified:
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
(original)
+++
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
Wed Jul 2 15:58:53 2014
@@ -15,48 +15,47 @@
# specific language governing permissions and limitations
# under the License.
resource=Detalhes de Recursos
-umapping=Mapeamento de usu\u00E1rios
+umapping=Mapeamento de usu\u00e1rios
connectorProperties=Propriedades de Conectores
-security=Seguran\u00E7a
+security=Seguran\u00e7a
create_attribute=Criar novo recurso
-required_alert=Todos os campos deste formul\u00E1rio s\u00E3o obrigat\u00F3rios
+required_alert=Todos os campos deste formul\u00e1rio s\u00e3o obrigat\u00f3rios
connector=Conector
existing_resources=Recursos Existentes
-action=A\u00E7\u00E3o
+action=A\u00e7\u00e3o
edit_attribute=Alterar Recurso
title=Recurso
extAttrNames=Atributos Externos
intMappingTypes=Tipos internos de mapeamentos
entity=Entidade
-roleSchema=Esquema de Fun\u00E7\u00E3o
+roleSchema=Esquema de Fun\u00e7\u00e3o
accountId=Identificador da Conta
-mandatoryCondition=Obrigat\u00F3rio
+mandatoryCondition=Obrigat\u00f3rio
password=Senha
-purpose=Prop\u00F3sito
-mappingUserSchema=Esquema de mapeamento de usu\u00E1rio
-mappingRoleSchema=Esquema de mapeamento de fun\u00E7\u00E3o
+purpose=Prop\u00f3sito
+mappingUserSchema=Esquema de mapeamento de usu\u00e1rio
+mappingRoleSchema=Esquema de mapeamento de fun\u00e7\u00e3o
delete=Excluir
intAttrNames=Atributos internos
-enforceMandatoryCondition=Aplicar condi\u00E7\u00E3o obrigat\u00F3ria
+enforceMandatoryCondition=Aplicar condi\u00e7\u00e3o obrigat\u00f3ria
fieldName=Nome do Campo
accountIdValidation=Precisa ser exatamente um Identificador de Conta
-propagationMode=Modo de propaga\u00E7\u00E3o
+propagationMode=Modo de propaga\u00e7\u00e3o
accountLink=Link de Conta
enable=Habilitado
-createTraceLevel=Criar n\u00EDvel de trace
-updateTraceLevel=Atualizar n\u00EDvel de trace
-deleteTraceLevel=Excluir n\u00EDvel de trace
-syncTraceLevel=N\u00EDvel de trace de sincroniza\u00E7\u00E3o
-propagationPriority=Prioridade de propaga\u00E7\u00E3o
-propagationPrimary=Propaga\u00E7\u00E3o prim\u00E1ria
-resetToken=Resetar token
+createTraceLevel=Criar n\u00edvel de trace
+updateTraceLevel=Atualizar n\u00edvel de trace
+deleteTraceLevel=Excluir n\u00edvel de trace
+syncTraceLevel=N\u00edvel de trace de sincroniza\u00e7\u00e3o
+propagationPriority=Prioridade de propaga\u00e7\u00e3o
+propagationPrimary=Propaga\u00e7\u00e3o prim\u00e1ria
-success_connection=Conex\u00E3o com sucesso
-error_connection=Conex\u00E3o sem sucesso
-check=Verificar a conex\u00E3o
-actionsClass=Classe de A\u00E7\u00F5es
+success_connection=Conex\u00e3o com sucesso
+error_connection=Conex\u00e3o sem sucesso
+check=Verificar a conex\u00e3o
+actionsClass=Classe de A\u00e7\u00f5es
rmapping=Regra de Mapeamento
new=novo
-randomPwdIfNotProvided=Gerar senhas aleat\u00F3rias quando n\u00E3o houver
+randomPwdIfNotProvided=Gerar senhas aleat\u00f3rias quando n\u00e3o houver
Modified:
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
(original)
+++
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
Wed Jul 2 15:58:53 2014
@@ -126,15 +126,6 @@ under the License.
<span wicket:id="syncTraceLevel">[syncTraceLevel]</span>
</div>
</div>
-
- <div class="tablerow alt">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="resetToken"><wicket:message key="resetToken"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="resetToken">[resetToken]</span>
- </div>
- </div>
</div>
</wicket:panel>
</html>
Modified:
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
(original)
+++
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
Wed Jul 2 15:58:53 2014
@@ -34,6 +34,7 @@ under the License.
<span wicket:id="panelCreate">[plus]</span>
<span wicket:id="panelUserTemplate">[plus]</span>
<span wicket:id="panelRoleTemplate">[plus]</span>
+ <span wicket:id="panelReset">[plus]</span>
<span wicket:id="panelEdit">[plus]</span>
<span wicket:id="panelExport">[plus]</span>
<span wicket:id="panelDelete">[plus]</span>
@@ -48,63 +49,67 @@ under the License.
</wicket:fragment>
<wicket:fragment wicket:id="fragmentCreate">
- <a href="#" wicket:id="createLink"><img id="action"
src="img/actions/create.png" alt="create icon" title="Create"/></a>
+ <a href="#" wicket:id="createLink"><img id="action"
src="img/actions/create.png" alt="create icon" title="Create"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentSearch">
- <a href="#" wicket:id="searchLink"><img id="action"
src="img/actions/search.png" alt="search icon" title="Search and modify"/></a>
+ <a href="#" wicket:id="searchLink"><img id="action"
src="img/actions/search.png" alt="search icon" title="Search and modify"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentEnable">
- <a href="#" wicket:id="enableLink"><img id="action"
src="img/actions/enable.png" alt="enable icon" title="Enable / Disable"/></a>
+ <a href="#" wicket:id="enableLink"><img id="action"
src="img/actions/enable.png" alt="enable icon" title="Enable / Disable"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentEdit">
- <a href="#" wicket:id="editLink"><img id="action"
src="img/actions/edit.png" alt="edit icon" title="Edit"/></a>
+ <a href="#" wicket:id="editLink"><img id="action"
src="img/actions/edit.png" alt="edit icon" title="Edit"/></a>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="fragmentReset">
+ <a href="#" wicket:id="resetLink"><img id="action"
src="img/actions/reset.png" alt="reset icon" title="Reset sync token"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentUserTemplate">
- <a href="#" wicket:id="userTemplateLink"><img id="action"
src="img/actions/user_template.png" alt="user template icon" title="Specify
user template"/></a>
+ <a href="#" wicket:id="userTemplateLink"><img id="action"
src="img/actions/user_template.png" alt="user template icon" title="Specify
user template"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentRoleTemplate">
- <a href="#" wicket:id="roleTemplateLink"><img id="action"
src="img/actions/role_template.png" alt="role template icon" title="Specify
role template"/></a>
+ <a href="#" wicket:id="roleTemplateLink"><img id="action"
src="img/actions/role_template.png" alt="role template icon" title="Specify
role template"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentDelete">
- <a href="#" wicket:id="deleteLink"><img id="action"
src="img/actions/delete.png" alt="delete icon" title="Delete"/></a>
+ <a href="#" wicket:id="deleteLink"><img id="action"
src="img/actions/delete.png" alt="delete icon" title="Delete"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentDryRun">
- <a href="#" wicket:id="dryRunLink"><img id="action"
src="img/actions/dryrun.png" alt="dryrun icon" title="DryRun"/></a>
+ <a href="#" wicket:id="dryRunLink"><img id="action"
src="img/actions/dryrun.png" alt="dryrun icon" title="DryRun"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentExecute">
- <a href="#" wicket:id="executeLink"><img id="action"
src="img/actions/execute.png" alt="execute icon" title="Execute"/></a>
+ <a href="#" wicket:id="executeLink"><img id="action"
src="img/actions/execute.png" alt="execute icon" title="Execute"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentSelect">
- <a href="#" wicket:id="selectLink"><img id="action"
src="img/actions/select.png" alt="select icon" title="Select"/></a>
+ <a href="#" wicket:id="selectLink"><img id="action"
src="img/actions/select.png" alt="select icon" title="Select"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentExport">
- <a href="#" wicket:id="exportLink"><img id="action"
src="img/actions/export.png" alt="export icon" title="Export"/></a>
+ <a href="#" wicket:id="exportLink"><img id="action"
src="img/actions/export.png" alt="export icon" title="Export"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentSuspend">
- <a href="#" wicket:id="suspendLink"><img id="action"
src="img/actions/suspend.png" alt="suspend icon" title="Suspend"/></a>
+ <a href="#" wicket:id="suspendLink"><img id="action"
src="img/actions/suspend.png" alt="suspend icon" title="Suspend"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentReactivate">
- <a href="#" wicket:id="reactivateLink"><img id="action"
src="img/actions/reactivate.png" alt="reactivate icon" title="Reactivate"/></a>
+ <a href="#" wicket:id="reactivateLink"><img id="action"
src="img/actions/reactivate.png" alt="reactivate icon" title="Reactivate"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentReload">
- <a href="#" wicket:id="reloadLink"><img id="action"
src="img/actions/reload.png" alt="reload icon" title="Reload"/></a>
+ <a href="#" wicket:id="reloadLink"><img id="action"
src="img/actions/reload.png" alt="reload icon" title="Reload"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentChangeView">
- <a href="#" wicket:id="changeViewLink"><img id="action"
src="img/actions/settings-icon.png" alt="Change view icon" title="Change
view"/></a>
+ <a href="#" wicket:id="changeViewLink"><img id="action"
src="img/actions/settings-icon.png" alt="Change view icon" title="Change
view"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="emptyFragment">
Added: syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png?rev=1607404&view=auto
==============================================================================
Binary file - no diff available.
Propchange: syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -50,7 +50,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
- selenium.click("//tr/td[3]/div/span[9]/a");
+ selenium.click("//tr/td[3]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='key:textField']\");",
"30000");
@@ -98,7 +98,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
- selenium.click("//tr[7]/td[3]/div/span[11]/a");
+ selenium.click("//tr[7]/td[3]/div/span[12]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to
delete the selected item(s)?"));
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -63,7 +63,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//tr[4]/td[7]/div/span[9]/a");
+ selenium.click("//tr[4]/td[7]/div/span[10]/a");
selenium.waitForCondition(
"selenium.isElementPresent(\"//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select\");",
"30000");
@@ -90,7 +90,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//tr[4]/td[7]/div/span[11]/a");
+ selenium.click("//tr[4]/td[7]/div/span[12]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to
delete the selected item(s)?"));
@@ -104,7 +104,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//tr[2]/td[7]/div/span[9]/a");
+ selenium.click("//tr[2]/td[7]/div/span[10]/a");
selenium.waitForCondition(
"selenium.isElementPresent(\"//select[@name='version:dropDownChoiceField']\");",
"30000");
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -27,7 +27,7 @@ public class ReportTestITCase extends Ab
selenium.click("css=img[alt=\"Reports\"]");
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
- selenium.click("//table/tbody/tr/td[8]/div/span[9]/a");
+ selenium.click("//table/tbody/tr/td[8]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");",
"30000");
selenium.selectFrame("index=0");
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -42,7 +42,7 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
- selenium.click("//td[6]/div/span[9]/a");
+ selenium.click("//td[6]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent(" +
"\"class=wicket_modal\");", "30000");
selenium.waitForFrameToLoad("class=wicket_modal", "30000");
@@ -69,7 +69,7 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
- selenium.click("//tr[3]/td[6]/div/span[11]/a");
+ selenium.click("//tr[3]/td[6]/div/span[12]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to
delete the selected item(s)?"));
}
@@ -80,7 +80,7 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
- selenium.click("//td[6]/div/span[9]/a");
+ selenium.click("//td[6]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent("
+
"\"//form/div[3]/div/span/div/div/div/label[text()='Name']\");", "30000");
@@ -107,7 +107,7 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
-
selenium.click("//*[@id=\"users-contain\"]//*[div=\"ws-target-resource-delete\"]/../td[6]/div/span[9]/a");
+
selenium.click("//*[@id=\"users-contain\"]//*[div=\"ws-target-resource-delete\"]/../td[6]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent("
+
"\"//form/div[3]/div/span/div/div/div/label[text()='Name']\");", "30000");
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -132,9 +132,9 @@ public class RoleTestITCase extends Abst
selenium.click("//input[@name=\"userListContainer:search\"]");
-
selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[5]/div/span[9]/a\");",
"30000");
+
selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[5]/div/span[10]/a\");",
"30000");
- selenium.click("//table/tbody/tr/td[5]/div/span[9]/a");
+ selenium.click("//table/tbody/tr/td[5]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent("
+
"\"//form/div[3]/div/span/div/div/div[contains(text(),'Username')]\");",
"30000");
@@ -158,7 +158,7 @@ public class RoleTestITCase extends Abst
selenium.click("//input[@name=\"userListContainer:search\"]");
-
selenium.waitForCondition("selenium.isElementPresent(\"//span[11]/a\");",
"30000");
+
selenium.waitForCondition("selenium.isElementPresent(\"//span[12]/a\");",
"30000");
}
@Test
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -52,7 +52,7 @@ public class SchemaTestITCase extends Ab
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
-
selenium.click("//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[11]/a");
+
selenium.click("//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[12]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to
delete the selected item(s)?"));
}
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -38,9 +38,9 @@ public class TaskTestITCase extends Abst
selenium.waitForCondition("selenium.isTextPresent(" + "\"Operation
executed successfully\");", "30000");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//tr[4]/td[10]/div/span[9]/a/img\");", "30000");
+ + "\"//tr[4]/td[10]/div/span[10]/a/img\");", "30000");
- selenium.click("//tr[4]/td[10]/div/span[9]/a/img");
+ selenium.click("//tr[4]/td[10]/div/span[10]/a/img");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");",
"30000");
selenium.selectFrame("index=0");
Modified:
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java?rev=1607404&r1=1607403&r2=1607404&view=diff
==============================================================================
---
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
(original)
+++
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
Wed Jul 2 15:58:53 2014
@@ -56,7 +56,7 @@ public class UserTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
//Edit vivaldi
-
selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[5]/div/span[9]/a");
+
selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[5]/div/span[10]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");",
"30000");
selenium.selectFrame("index=0");
@@ -101,7 +101,7 @@ public class UserTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"30000");
-
selenium.click("//*[@id=\"users-contain\"]//*[div=4]/../td[5]/div/span[11]/a");
+
selenium.click("//*[@id=\"users-contain\"]//*[div=4]/../td[5]/div/span[12]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to
delete the selected item(s)?"));
