From d238244d452c5b7658d22422b570ad7e02156385 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 14 May 2014 10:29:19 +1000 Subject: [PATCH 1/2] fix maintainers list not updated after add/remove: https://bugzilla.redhat.com/show_bug.cgi?id=1097470 --- .../src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml | 4 ++-- .../webapp/WEB-INF/layout/version-group/settings-tab.xhtml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml index 18ae206b7e..dc9af81500 100644 --- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml +++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml @@ -378,7 +378,7 @@ action="#{projectHome.removeMaintainer(maintainer)}" oncomplete="zanata.form.appendCheckboxes(getUserRoleId())" styleClass="l--float-right txt--danger reveal__target" - render="settings-permissions-form,maintainers-size,maintainers_content"> + render="settings-permissions-form,maintainers-size,maintainers-form"> @@ -394,7 +394,7 @@ actionBean="#{projectHome.maintainerAutocomplete}" maxlength="80" minlength="3" id="maintainerAutocomplete" fetchValue="#{result.account.username}" - render="settings-permissions-form,maintainers-size, maintainers_content" + render="settings-permissions-form,maintainers-size, maintainers-form" oncomplete="zanata.form.appendCheckboxes(getUserRoleId());focusCurrentActiveInput()" placeholder="#{messages['jsf.SearchUsers']}"> diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml index 9cd3c957ce..c188c4aa94 100644 --- a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml +++ b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml @@ -198,7 +198,7 @@ + render="settings-maintainers-form,maintainers-size,maintainers-list,maintainers-form"> @@ -214,7 +214,7 @@ actionBean="#{versionGroupHome.maintainerAutocomplete}" maxlength="80" minlength="3" id="maintainerAutocomplete" fetchValue="#{result.account.username}" - render="settings-maintainers-form" + render="settings-maintainers-form,maintainers-size,maintainers-list,maintainers-form" oncomplete="focusCurrentActiveInput()" placeholder="#{messages['jsf.SearchUsers']}"> From 75d8718c0da5a6f5506a5db0d3ec5fb5b39ac4fe Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 14 May 2014 14:35:19 +1000 Subject: [PATCH 2/2] Fix removing maintainers to update maintainer list --- zanata-war/src/main/java/org/zanata/action/ProjectHome.java | 2 +- .../src/main/java/org/zanata/action/VersionGroupHome.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java index 0e4efb45ff..161f41e5a5 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java @@ -342,7 +342,7 @@ public String removeMaintainer(HPerson person) { .getMessage("jsf.project.NeedAtLeastOneMaintainer")); } else { getInstance().getMaintainers().remove(person); - + maintainerFilter.reset(); update(); conversationScopeMessages.setMessage(FacesMessage.SEVERITY_INFO, diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java index 2de7eeea09..5c64929740 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java @@ -51,7 +51,6 @@ import org.zanata.service.impl.VersionGroupServiceImpl; import org.zanata.ui.AbstractAutocomplete; import org.zanata.ui.AbstractListFilter; -import org.zanata.ui.FilterUtil; import org.zanata.ui.InMemoryListFilter; import org.zanata.ui.autocomplete.LocaleAutocomplete; import org.zanata.ui.autocomplete.MaintainerAutocomplete; @@ -199,6 +198,7 @@ public void removeMaintainer(HPerson maintainer) { .getMessage("jsf.group.NeedAtLeastOneMaintainer")); } else { getInstance().removeMaintainer(maintainer); + maintainerFilter.reset(); update(); conversationScopeMessages.setMessage(FacesMessage.SEVERITY_INFO, zanataMessages.getMessage("jsf.MaintainerRemoveFromGroup",