merge failed, update....

This commit is contained in:
yumaojun
2015-11-13 13:06:17 +08:00
parent 9ec2b9ff1d
commit 9379bc1f6e
5 changed files with 34 additions and 25 deletions

View File

@@ -58,7 +58,7 @@
<a href="/jasset/asset_list/?gid={{ user.id }}">{{ rule | rule_member_count:"user" }} </a>
</td>
<td class="text-center">
<a href="/jasset/group_list/?gid={{ user.id }}">{{ rule | rule_member_count:"usergroup" }}</a>
<a href="/jasset/group_list/?gid={{ user.id }}">{{ rule | rule_member_count:"user_group" }}</a>
</td>
<td class="text-center">
<a href="/jasset/group_list/?gid={{ user.id }}">{{ rule | rule_member_count:"asset" }}</a>