Merge branch 'master' of github.com:zanata/zanata-platform into ZNTA-…

…2139
zanata · Jul 26, 2017 · 61c2ee1 · 61c2ee1
2 parents 66e1c65 + 10575d6
commit 61c2ee1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
@@ -60,6 +60,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
+import org.zanata.util.UrlUtil;
 
 /**
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
@@ -94,6 +95,8 @@ public class VersionGroupHome extends SlugHome<HIterationGroup>
     private VersionAutocomplete versionAutocomplete;
     @Inject
     private GroupLocaleAutocomplete localeAutocomplete;
+    @Inject
+    private UrlUtil urlUtil;
     private AbstractListFilter<HPerson> maintainerFilter =
             new InMemoryListFilter<HPerson>() {
 
@@ -223,10 +226,14 @@ public void removeMaintainer(HPerson maintainer) {
         } else {
             getInstance().removeMaintainer(maintainer);
             maintainerFilter.reset();
-            update();
+            super.update();
             conversationScopeMessages.setMessage(FacesMessage.SEVERITY_INFO,
                     msgs.format("jsf.MaintainerRemoveFromGroup",
                             maintainer.getName()));
+            if (maintainer.equals(authenticatedAccount.getPerson())) {
+                urlUtil.redirectToInternal(
+                        urlUtil.groupUrl(getInstance().getSlug()));
+            }
         }
     }
 

diff --git a/server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java b/server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
@@ -500,8 +500,11 @@ public boolean canDownloadFiles(HProjectIteration projectIteration) {
      */
     @GrantsPermission(actions = "update")
     public boolean canUpdateVersionGroup(HIterationGroup group) {
-        return isLoggedIn()
-                && authenticatedAccount.get().getPerson().isMaintainer(group);
+        if (isLoggedIn()) {
+            HPerson person = authenticatedAccount.get().getPerson();
+            return group.getMaintainers().contains(person);
+        }
+        return false;
     }
 
     @GrantsPermission(actions = "insert")

diff --git a/server/zanata-war/src/main/java/org/zanata/util/UrlUtil.java b/server/zanata-war/src/main/java/org/zanata/util/UrlUtil.java
@@ -138,6 +138,10 @@ public String projectUrl(String projectSlug) {
         return contextPath + "/project/view/" + projectSlug + dswidQuery;
     }
 
+    public String groupUrl(String groupSlug) {
+        return contextPath + "/version-group/view/" + groupSlug + dswidQuery;
+    }
+
     /**
      * Get add-version url with dswid parameter
      */

diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
@@ -223,7 +223,6 @@
               styleClass="button--link l--float-right reveal__target"
               action="#{versionGroupHome.removeMaintainer(maintainer)}"
               onbegin="jQuery('#remove-maintainer-#{status.index}').addClass('is-hidden')"
-              execute="@this"
               render="settings-maintainers-form,maintainers-size,maintainers-list,maintainers-form"
               title="#{msgs['jsf.group.RemoveMaintainer.title']}">
               <span class="is-sr-only">#{msgs['jsf.group.RemoveMaintainer.sr.label']}</span>

diff --git a/server/zanata-war/src/main/webapp/resources/assets/css/style.css b/server/zanata-war/src/main/webapp/resources/assets/css/style.css
@@ -3386,11 +3386,11 @@ All icons also need the class `.i` added to them.
 Use to display icons to the far side of text, either left or right. Usually used in a list.
 
 <ul class="list--no-bullets">
-	<li class="i__item--left">Text <i class="i i__item__icon i--export"></i></li>
-	<li class="i__item--right">Text <i class="i i__item__icon i--export"></i></li>
-	<li>
-		<a href="" class="i__item--left">Text <i class="i i__item__icon i--export"></i></a>
-	</li>
+    <li class="i__item--left">Text <i class="i i__item__icon i--export"></i></li>
+    <li class="i__item--right">Text <i class="i i__item__icon i--export"></i></li>
+    <li>
+        <a href="" class="i__item--left">Text <i class="i i__item__icon i--export"></i></a>
+    </li>
 </ul>
 
 */

diff --git a/server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json b/server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json
@@ -1340,4 +1340,4 @@
       "UntitledProject": "MzAzZWE0YTEwNjhkNTQ4NjkxYmQ4YTlmZjRlYjNiNTAjMSMxNDc2MDU4MzgwIyMj"
     }
   }
-}
+}