shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-10 01:17:59 +03:00
Code Issues Releases Wiki Activity

Added "info" to mac users

Browse Source 
Restored overview info to match item info
This commit is contained in:
Adolfo Gómez García 2015-02-11 11:22:56 +01:00
parent 3e5cbda861
commit d1adcebe4b
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/uds/REST/methods/services_pools.py
View File

@ -82,6 +82,7 @@ class ServicesPools(ModelHandler):
'name': item.name,
'comments': item.comments,
'state': item.state if item.service.provider.maintenance_mode is False else State.MAINTENANCE,
'thumb': item.image.thumb64 if item.image is not None else DEFAULT_THUMB_BASE64,
'service_id': item.service.uuid,
'provider_id': item.service.provider.uuid,
'image_id': item.image.uuid if item.image is not None else None,
@ -99,20 +100,6 @@ class ServicesPools(ModelHandler):
return val
def item_as_dict_overview(self, item):
# if item does not have an associated service, hide it (the case, for example, for a removed service)
# Access from dict will raise an exception, and item will be skipped
return {
'id': item.uuid,
'name': item.name,
'comments': item.comments,
'state': item.state if item.service.provider.maintenance_mode is False else State.MAINTENANCE,
'thumb': item.image.thumb64 if item.image is not None else DEFAULT_THUMB_BASE64,
'service_id': item.service.uuid,
'restrained': item.isRestrained(),
'show_transports': item.show_transports,
}
# Gui related
def getGui(self, type_):
if OSManager.objects.count() < 1: # No os managers, can't create db

8
server/src/uds/transports/RDP/web.py
View File

@ -90,6 +90,14 @@ def generateHtmlForRdp(transport, idUserService, idTransport, os, ip, port, user
res += ('<div><p>' + _('In order to use this service, you should first install CoRD.') + '</p>'
'<p><a href="/static/other/CoRD.pkg">' + _('Download CoRD') + '</a></p>'
'</div>'
'<div>'
'<p>' + _('Attention Safari Users:') + '<br/>'
'<p>' + _('In order to access theese services, you will need to enable this in order to access to service:') + '</p>'
'<p>' + _('Go to Safari > Preferences > Security > Manage Website Settings') + '</p>'
'<p>' + _('Click Java in left hand panel, and select site to allow UDS Rdp, and set it to Allow Always (also mark "Unsecure mode").') + '</p>'
'<p>' + _('Users of Firefox or Chrome:') + '</p>'
'<p>' + _('If any warning is shown when launching RDP Applet, press "ignore" and continue') + '</p>'
'</div>'
)
return res