Return-Path: 
 <commits-return-5296-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-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 72D429DF0
	for <apmail-archiva-commits-archive@www.apache.org>;
 Wed, 28 Dec 2011 17:11:44 +0000 (UTC)
Received: (qmail 1585 invoked by uid 500); 28 Dec 2011 17:11:44 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 1553 invoked by uid 500); 28 Dec 2011 17:11:44 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 1526 invoked by uid 99); 28 Dec 2011 17:11:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2011 17:11:44 +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; Wed, 28 Dec 2011 17:11:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C662023889ED
	for <commits@archiva.apache.org>; Wed, 28 Dec 2011 17:11:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1225238 -
 /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
Date: Wed, 28 Dec 2011 17:11:22 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111228171122.C662023889ED@eris.apache.org>

Author: olamy
Date: Wed Dec 28 17:11:22 2011
New Revision: 1225238

URL: http://svn.apache.org/viewvc?rev=1225238&view=rev
Log:
fix impl of role edit view when operations or resources are not array but a single one

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1225238&r1=1225237&r2=1225238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html Wed Dec 28 17:11:22 2011
@@ -62,20 +62,32 @@
   <div class="page-header">
     <h3>${$.i18n.prop('role.parents')}</h3>
   </div>
-  <ul>
-  {{each parentRoleNames}}
-    <li>${$value}</li>
-  {{/each}}
-  </ul>
+  {{if childRoleNames}}
+    <ul>
+      {{if $.isArray(childRoleNames)}}
+        {{each parentRoleNames}}
+          <li>${$value}</li>
+        {{/each}}
+      {{else}}
+        <li>${childRoleNames}</li>
+      {{/if}}
+    </ul>
+  {{/if}}
 
   <div class="page-header">
     <h3>${$.i18n.prop('role.childs')}</h3>
   </div>
-  <ul>
-    {{each childRoleNames}}
-      <li>${$value}</li>
-    {{/each}}
-  </ul>
+  {{if childRoleNames}}
+    <ul>
+      {{if $.isArray(childRoleNames)}}
+        {{each childRoleNames}}
+          <li>${$value}</li>
+        {{/each}}
+      {{else}}
+        <li>${childRoleNames}</li>
+      {{/if}}
+    </ul>
+  {{/if}}
 
   {{if permissions}}
     <div class="page-header">
@@ -90,13 +102,21 @@
         </tr>
       </thead>
       <tbody>
-        {{each permissions}}
+        {{if $.isArray(permissions)}}
+          {{each permissions}}
+            <tr>
+              <td>${$value.name}</td>
+              <td>${$value.operation.name}</td>
+              <td>${$value.resource.identifier}</td>
+            </tr>
+          {{/each}}
+        {{else}}
           <tr>
-            <td>${$value.name}</td>
-            <td>${$value.operation.name}</td>
-            <td>${$value.resource.identifier}</td>
+            <td>${permissions.name}</td>
+            <td>${permissions.operation.name}</td>
+            <td>${permissions.resource.identifier}</td>
           </tr>
-        {{/each}}
+        {{/if}}
       </tbody>
     </table>
   {{/if}}