Return-Path: X-Original-To: apmail-ace-commits-archive@www.apache.org Delivered-To: apmail-ace-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A3DA9A74 for ; Fri, 16 Mar 2012 21:03:33 +0000 (UTC) Received: (qmail 77542 invoked by uid 500); 16 Mar 2012 21:03:33 -0000 Delivered-To: apmail-ace-commits-archive@ace.apache.org Received: (qmail 77520 invoked by uid 500); 16 Mar 2012 21:03:33 -0000 Mailing-List: contact commits-help@ace.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ace.apache.org Delivered-To: mailing list commits@ace.apache.org Received: (qmail 77512 invoked by uid 99); 16 Mar 2012 21:03:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 21:03:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 21:03:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EADBB23889B3 for ; Fri, 16 Mar 2012 21:03:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1301759 - /ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java Date: Fri, 16 Mar 2012 21:03:09 -0000 To: commits@ace.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120316210309.EADBB23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Fri Mar 16 21:03:09 2012 New Revision: 1301759 URL: http://svn.apache.org/viewvc?rev=1301759&view=rev Log: ACE-63 fixes to some of the user roles to make all columns show up again Modified: ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java Modified: ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java URL: http://svn.apache.org/viewvc/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1301759&r1=1301758&r2=1301759&view=diff ============================================================================== --- ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java (original) +++ ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java Fri Mar 16 21:03:09 2012 @@ -243,7 +243,7 @@ public class VaadinClient extends com.va private void initGrid(User user) { Authorization auth = m_userAdmin.getAuthorization(user); int count = 0; - for (String role : new String[] { "viewBundle", "viewGroup", "viewLicense", "viewTarget" }) { + for (String role : new String[] { "viewArtifact", "viewFeature", "viewDistribution", "viewTarget" }) { if (auth.hasRole(role)) { count++; } @@ -270,7 +270,7 @@ public class VaadinClient extends com.va m_artifactToolbar.addComponent(dynamicCheckBox); count = 0; - if (auth.hasRole("viewBundle")) { + if (auth.hasRole("viewArtifact")) { m_grid.addComponent(m_artifactsPanel, count, 2); m_grid.addComponent(m_artifactToolbar, count, 1); count++; @@ -279,7 +279,7 @@ public class VaadinClient extends com.va m_featuresPanel = createFeaturesPanel(m_mainWindow); m_featureToolbar = createAddFeatureButton(m_mainWindow); - if (auth.hasRole("viewGroup")) { + if (auth.hasRole("viewFeature")) { m_grid.addComponent(m_featuresPanel, count, 2); m_grid.addComponent(m_featureToolbar, count, 1); count++; @@ -288,7 +288,7 @@ public class VaadinClient extends com.va m_distributionsPanel = createDistributionsPanel(m_mainWindow); m_distributionToolbar = createAddDistributionButton(m_mainWindow); - if (auth.hasRole("viewLicense")) { + if (auth.hasRole("viewDistribution")) { m_grid.addComponent(m_distributionsPanel, count, 2); m_grid.addComponent(m_distributionToolbar, count, 1); count++;