From: Olivier Lamy <olamy@apache.org>
Date: Wed, 28 Dec 2011 17:11:22 +0000 (+0000)
Subject: fix impl of role edit view when operations or resources are not array but a single one
X-Git-Tag: archiva-1.4-M3~1685
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd7af26609c9b3945eec8a084ec007f38ac2f007;p=archiva.git

fix impl of role edit view when operations or resources are not array but a single one

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1225238 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
index 8a856b61a..cffcae262 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
@@ -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}}