haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity

[system/org admin] rm 'email' for group member; modified 'Info' icon for org admin side nav

Browse Source
This commit is contained in:
llj
2018-09-11 15:08:27 +08:00
parent bbd10c13da
commit 76489d2ca4
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
seahub/templates/js/admin-common-templates.html
View File

@@ -20,14 +20,7 @@
<script type="text/template" id="group-member-item-tmpl"> <script type="text/template" id="group-member-item-tmpl">
<td><img src="<%= avatar_url %>" alt="" width="20" class="avatar" /></td> <td><img src="<%= avatar_url %>" alt="" width="20" class="avatar" /></td>
<td><%- name %></td> <td><a href="<%= user_info_url %>"><%- name %></a></td>
<td>
<% if (app.pageOptions.org_id) { %>
<a href="{{ SITE_ROOT }}org/useradmin/info/<% print(encodeURIComponent(email)); %>/"><%- email %></a>
<% } else { %>
<a href="{{ SITE_ROOT }}useradmin/info/<% print(encodeURIComponent(email)); %>/"><%- email %></a>
<% } %>
</td>
<td> <td>
<% if (role == 'Owner') { %> <% if (role == 'Owner') { %>
<span class="cur-role">{% trans "Owner" %}</span> <span class="cur-role">{% trans "Owner" %}</span>
@@ -123,9 +116,8 @@
<thead> <thead>
<tr> <tr>
<th width="5%"></th> <th width="5%"></th>
<th width="25%">{% trans "Name" %}</th> <th width="50%">{% trans "Name" %}</th>
<th width="35%">{% trans "Email" %}</th> <th width="35%">{% trans "Role" %}</th>
<th width="25%">{% trans "Role" %}</th>
<th width="10%"><!--Operations--></th> <th width="10%"><!--Operations--></th>
</tr> </tr>
</thead> </thead>

2
seahub/templates/js/orgadmin-templates.html
View File

@@ -5,7 +5,7 @@
<h3 class="hd">{% trans "Admin" %}</h3> <h3 class="hd">{% trans "Admin" %}</h3>
<ul class="side-tabnav-tabs"> <ul class="side-tabnav-tabs">
<li class="tab"> <li class="tab">
<a href="{% url 'org_manage' %}"><span class="sf2-icon-organization"></span>{% trans "Info" %}</a> <a href="{% url 'org_manage' %}"><span class="sf2-icon-info"></span>{% trans "Info" %}</a>
</li> </li>
<li class="tab"> <li class="tab">
<a href="{% url 'org_repo_admin' %}"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a> <a href="{% url 'org_repo_admin' %}"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a>

5
seahub/templates/js/sysadmin-templates.html
View File

@@ -905,9 +905,8 @@
<thead> <thead>
<tr> <tr>
<th width="5%"></th> <th width="5%"></th>
<th width="25%">{% trans "Name" %}</th> <th width="50%">{% trans "Name" %}</th>
<th width="35%">{% trans "Email" %}</th> <th width="35%">{% trans "Role" %}</th>
<th width="25%">{% trans "Role" %}</th>
<th width="10%"><!--Operations--></th> <th width="10%"><!--Operations--></th>
</tr> </tr>
</thead> </thead>

16
static/scripts/sysadmin-app/views/group-member.js
View File

@@ -113,7 +113,21 @@ define([
}, },
render: function() { render: function() {
this.$el.html(this.template(this.model.toJSON())); var data = this.model.toJSON();
// get user info url
var email = this.model.get('email');
var url = app.config.siteRoot;
if (app.pageOptions.org_id) {
url += 'org/useradmin/info/' + encodeURIComponent(email);
} else {
url += 'useradmin/info/' + encodeURIComponent(email);
}
$.extend(data, {
'user_info_url': url
});
this.$el.html(this.template(data));
return this; return this;
} }