Merge branch 'release' into integration/master

zanata · May 14, 2014 · 6aadeb1 · 6aadeb1
2 parents 402c73e + 798d814
commit 6aadeb1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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
@@ -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
@@ -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",

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
@@ -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">
             <i class="i--large i--remove"></i>
           </a4j:commandLink>
         </li>
@@ -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
@@ -198,7 +198,7 @@
             <a4j:commandLink
               action="#{versionGroupHome.removeMaintainer(maintainer)}"
               styleClass="l--float-right txt--danger reveal__target"
-              render="settings-maintainers-form,maintainers-size,maintainers-list,maintainers_content">
+              render="settings-maintainers-form,maintainers-size,maintainers-list,maintainers-form">
               <i class="i--large i--remove"></i>
             </a4j:commandLink>
           </li>
@@ -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']}">