Browse Source

Fix flags

Nathaniel van Diepen 8 years ago
parent
commit
75d97b4662
2 changed files with 25 additions and 11 deletions
  1. 7 9
      site/index.php
  2. 18 2
      site/js/index.js

+ 7 - 9
site/index.php

@@ -174,21 +174,19 @@
 											</td>
 											<td>
 												{{#if ../canaccess}}
-													<a onclick="window.ModifyChannelAccess('{{../../name}}','{{this.name}}',{{this.id}});" style="cursor:pointer;">
+													<a onclick="window.ModifyChannelAccess('{{../name}}','{{this.name}}',{{this.id}});" style="cursor:pointer;">
 														<?php echo __('Modify'); ?>
 													</a>
 												{{/if}}
 											</td>
 										</tr>
 										{{#each this.flags}}
-											{{#if this.flag}}
-												<tr class='treegrid-{{this.flag}} treegrid-parent-{{../id}}'>
-													<td></td>
-													<td>
-														{{this.name}}
-													</td>
-												</tr>
-											{{/if}}
+											<tr class='treegrid-{{this.flag}} treegrid-parent-{{../id}}'>
+												<td></td>
+												<td>
+													{{this.name}}
+												</td>
+											</tr>
 										{{/each}}
 									{{/each}}
 									</table>

+ 18 - 2
site/js/index.js

@@ -563,12 +563,28 @@ $(function(){
 						location.reload();
 					}
 					var i,
+						j,
+						f,
 						n,
+						u,
 						div = $('<div>');
-					if(d.channels){
+					if(d.channels && d.flags){
 						for(i in d.channels){
 							n = d.channels[i];
-							d.channels[i] = n;
+							if(n.users){
+								for(j in n.users){
+									u = n.users[j];
+									if(u.flags){
+										for(f in u.flags){
+											u.flags[f] = {
+												flag: u.flags[f],
+												name: d.flags[u.flags[f]]
+											};
+										}
+									}
+								}
+								d.channels[i] = n;
+							}
 						}
 					}
 					div.append(templates.channels(d)).find('button').button();