burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed for 2.1 finsl

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-06-13 08:08:00 +02:00
parent de5e7380c4
commit e5d2c711ce
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
server/src/uds/static/adm/js/gui-d-services.coffee
View File

@ -216,29 +216,30 @@ gui.providers.link = (event) ->
prevTables.push servicesTable prevTables.push servicesTable
prevTables.push logTable prevTables.push logTable
usageAPI = api.providers.detail(id, "usage", { permission: selected[0].permission }) # usageAPI = api.providers.detail(id, "usage", { permission: selected[0].permission })
usage = new GuiElement(usageAPI, "usage-" + selected[0].type) # usage = new GuiElement(usageAPI, "usage-" + selected[0].type)
usageTable = usage.table( # usageTable = usage.table(
icon: 'usage' # icon: 'usage'
container: "usage-placeholder" # container: "usage-placeholder"
doNotLoadData: true # doNotLoadData: true
rowSelect: "multi" # rowSelect: "multi"
#
onData: (data) -> # onData: (data) ->
$.each data, (index, value) -> # $.each data, (index, value) ->
value.owner = gui.fastLink(value.owner.replace /@/, '<span class="text-danger">@</span>', "#{value.owner_info.auth_id},u#{value.owner_info.user_id}", 'gui.providers.fastLink', 'goAuthLink') # value.owner = gui.fastLink(value.owner.replace /@/, '<span class="text-danger">@</span>', "#{value.owner_info.auth_id},u#{value.owner_info.user_id}", 'gui.providers.fastLink', 'goAuthLink')
value.pool = gui.fastLink(value.pool, value.pool_id, 'gui.providers.fastLink', 'goPoolLink') # value.pool = gui.fastLink(value.pool, value.pool_id, 'gui.providers.fastLink', 'goPoolLink')
#
buttons: [ # buttons: [
"delete" # "delete"
"xls" # "xls"
] # ]
onDelete: gui.methods.del(usage, gettext("Delete user service"), gettext("User service deletion error"),) # onDelete: gui.methods.del(usage, gettext("Delete user service"), gettext("User service deletion error"),)
scrollToTable: false # scrollToTable: false
onLoad: (k) -> # onLoad: (k) ->
gui.tools.unblockUI() # gui.tools.unblockUI()
return # return
) # )
# prevTables.push usageTable
return return

6
server/src/uds/templates/uds/admin/tmpl/providers.html
View File

@ -29,7 +29,7 @@
<ul class="bottom_tabs nav nav-tabs"> <ul class="bottom_tabs nav nav-tabs">
<li class="active"><a href="#{{ provider_info }}" data-toggle="tab">{% endverbatim %}{% trans 'Overview' %}{% verbatim %}</a></li> <li class="active"><a href="#{{ provider_info }}" data-toggle="tab">{% endverbatim %}{% trans 'Overview' %}{% verbatim %}</a></li>
<li><a href="#{{ services }}_tab" data-toggle="tab">{% endverbatim %}{% trans 'Services' %}{% verbatim %}</a></li> <li><a href="#{{ services }}_tab" data-toggle="tab">{% endverbatim %}{% trans 'Services' %}{% verbatim %}</a></li>
<li><a href="#{{ usage }}_tab" data-toggle="tab">{% endverbatim %}{% trans 'Usage' %}{% verbatim %}</a></li> <!-- <li><a href="#{{ usage }}_tab" data-toggle="tab">{% endverbatim %}{% trans 'Usage' %}{% verbatim %}</a></li> -->
<li><a href="#{{ logs }}" data-toggle="tab">{% endverbatim %}{% trans 'Logs' %}{% verbatim %}</a></li> <li><a href="#{{ logs }}" data-toggle="tab">{% endverbatim %}{% trans 'Logs' %}{% verbatim %}</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
@ -47,12 +47,12 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tab-pane fade" id="{{ usage }}_tab"> <!-- <div class="tab-pane fade" id="{{ usage }}_tab">
<div class="row"> <div class="row">
<div class="col-xs-12" id="{{ usage }}"> <div class="col-xs-12" id="{{ usage }}">
</div> </div>
</div> </div>
</div> </div> -->
<div class="tab-pane fade" id="{{ logs }}">...</div> <div class="tab-pane fade" id="{{ logs }}">...</div>
</div> </div>
</div> </div>