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

Fixing versions so they are shown on web interface

Browse Source
This commit is contained in:
Adolfo Gómez García
2015-05-05 08:17:59 +02:00
parent d3e2ab85b8
commit 6fb9b11f1b
9 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/uds/REST/methods/client.py
View File

@ -43,6 +43,7 @@ from uds.web import errors
from uds.core.managers import cryptoManager, userServiceManager
from uds.core.util.Config import GlobalConfig
from uds.core.services.Exceptions import ServiceNotReadyError
from uds.core import VERSION as UDS_VERSION
import six

2
server/src/uds/core/__init__.py
View File

@ -41,3 +41,5 @@ from uds.core.BaseModule import Module
from uds.core import services
from uds.core import auths
from uds.core import transports
VERSION = '1.9.0'

14
server/src/uds/osmanagers/LinuxOsManager/__init__.py
View File

@ -35,6 +35,8 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_noop as _
from uds.core.osmanagers.OSManagersFactory import OSManagersFactory
from uds.core.managers.DownloadsManager import DownloadsManager
from uds.core import VERSION
from .LinuxOsManager import LinuxOsManager
from .LinuxRandomPassOsManager import LinuxRandomPassManager
import os.path
@ -43,17 +45,17 @@ import sys
OSManagersFactory.factory().insert(LinuxOsManager)
OSManagersFactory.factory().insert(LinuxRandomPassManager)
DownloadsManager.manager().registerDownloadable('udsactor_1.7.0_all.deb',
DownloadsManager.manager().registerDownloadable('udsactor_{version}_all.deb'.format(version=VERSION),
_('UDS Actor for Debian, Ubuntu, ... Linux machines <b>(Requires python 2.7)</b>'),
os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor_1.7.0_all.deb',
os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor_{version}_all.deb'.format(version=VERSION),
'application/x-debian-package')
DownloadsManager.manager().registerDownloadable('udsactor-1.7.0-1.noarch.rpm',
DownloadsManager.manager().registerDownloadable('udsactor-{version}-1.noarch.rpm'.format(version=VERSION),
_('UDS Actor for Centos, Fedora, RH, ... Linux machines <b>(Requires python 2.7)</b>'),
os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-1.7.0-1.noarch.rpm',
os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-{version}-1.noarch.rpm'.format(version=VERSION),
'application/x-redhat-package-manager')
DownloadsManager.manager().registerDownloadable('udsactor-opensuse-1.7.0-1.noarch.rpm',
DownloadsManager.manager().registerDownloadable('udsactor-opensuse-{version}-1.noarch.rpm'.format(version=VERSION),
_('UDS Actor for openSUSE, ... Linux machines <b>(Requires python 2.7)</b>'),
os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-opensuse-1.7.0-1.noarch.rpm',
os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-opensuse-{version}-1.noarch.rpm'.format(version=VERSION),
'application/x-redhat-package-manager')

6
server/src/uds/osmanagers/WindowsOsManager/__init__.py
View File

@ -15,6 +15,8 @@ from uds.core.managers.DownloadsManager import DownloadsManager
from .WindowsOsManager import WindowsOsManager
from .WinDomainOsManager import WinDomainOsManager
from .WinRandomPassOsManager import WinRandomPassManager
from uds.core import VERSION
import os.path
import sys
@ -22,7 +24,7 @@ OSManagersFactory.factory().insert(WindowsOsManager)
OSManagersFactory.factory().insert(WinDomainOsManager)
OSManagersFactory.factory().insert(WinRandomPassManager)
DownloadsManager.manager().registerDownloadable('UDSActorSetup.exe',
DownloadsManager.manager().registerDownloadable('UDSActorSetup-{version}.exe'.format(version=VERSION),
_('UDS Actor for windows machines'),
os.path.dirname(sys.modules[__package__].__file__) + '/files/UDSActorSetup.exe',
os.path.dirname(sys.modules[__package__].__file__) + '/files/UDSActorSetup-{version}.exe'.format(version=VERSION),
'application/x-msdos-program')

2
server/src/uds/templates/uds/html5/about.html
View File

@ -4,7 +4,7 @@
{% block body %}
<div class="jumbotron">
<h2 class="text-center">Universal Desktop Services</h2>
<h2 class="text-center">Universal Desktop Services {{ version }}</h2>
<p class="text-center"><small><a href="http://www.udsenterprise.com" target="_blank"> &copy; 2012-2015 Virtual Cable S.L.U.</a></small></p>
</div>

2
server/src/uds/templates/uds/html5/login.html
View File

@ -56,7 +56,7 @@
<div class="container">
<div class="row" id="login">
<div class="col-md-4 col-md-offset-4">
<h1 class="text-center login-title">{% trans 'Welcome to UDS' %}</h1>
<h1 class="text-center login-title">{% trans 'Welcome to UDS' %} {{ version }}</h1>
<div class="account-wall">
<img class="profile-img" src="{% get_static_prefix %}img/login-img.png" alt="">
<form id="loginform" class="form-signin" name="loginform" method="post">

13
server/src/uds/templatetags/html5.py
View File

@ -42,6 +42,7 @@ from uds.core.auths.auth import ROOT_ID
from uds.core.util.Config import GlobalConfig
from uds.models.Image import Image
from uds.core.managers.UserPrefsManager import UserPrefsManager
from uds.REST.methods.client import CLIENT_VERSION
import logging
@ -218,17 +219,17 @@ def pluginDownloadUrl(os):
tmpl = '<a href="{url}" class="btn btn-success">' + _('Download UDS Plugin for') + ' {os}</a>'
if os == 'windows':
return tmpl.format(url=static('clients/UDSClientSetup.exe'), os='Windows')
return tmpl.format(url=static('clients/UDSClientSetup-{version}.exe'.format(version=CLIENT_VERSION)), os='Windows')
elif os == 'linux':
linux_packages = (
('udsclient_1.7.5_all.deb', _('Debian based Linux')),
('udsclient-1.7.5-1.noarch.rpm', _('Red Hat based Linux (RH, Fedora, Centos, ...)')),
('udsclient-opensuse-1.7.5-1.noarch.rpm', _('Suse based Linux')),
('udsclient-1.7.5.tar.gz', _('Generic .tar.gz Linux'))
('udsclient_{version}_all.deb'.format(version=CLIENT_VERSION), _('Debian based Linux')),
('udsclient-{version}-1.noarch.rpm'.format(version=CLIENT_VERSION), _('Red Hat based Linux (RH, Fedora, Centos, ...)')),
('udsclient-opensuse-{version}-1.noarch.rpm'.format(version=CLIENT_VERSION), _('Suse based Linux')),
('udsclient-{version}.tar.gz'.format(version=CLIENT_VERSION), _('Generic .tar.gz Linux'))
)
res = ''
for v in linux_packages:
res += '<p class="text-center">' + tmpl.format(url=static('clients/' + v[0]), os=v[1]) + '</p>'
return res
else:
return tmpl.format(url=static('clients/UDSClient.pkg'), os='Mac OSX')
return tmpl.format(url=static('clients/UDSClient-{version}.pkg'.format(version=CLIENT_VERSION)), os='Mac OSX')

12
server/src/uds/web/views/index.py
View File

@ -43,13 +43,13 @@ from uds.core.util import html
from uds.core.ui import theme
from uds.core.managers.UserServiceManager import UserServiceManager
from uds.core import VERSION
import logging
logger = logging.getLogger(__name__)
__updated__ = '2015-04-27'
__updated__ = '2015-05-05'
def about(request):
@ -57,7 +57,13 @@ def about(request):
Shows the about page
:param request: http request
'''
return render(request, theme.template('about.html'))
return render_to_response(
theme.template('about.html'),
{
'version': VERSION,
},
context_instance=RequestContext(request)
)
@webLoginRequired(admin=False)

15
server/src/uds/web/views/login.py
View File

@ -42,12 +42,13 @@ from uds.core.util.Config import GlobalConfig
from uds.core.util.Cache import Cache
from uds.core.util import OsDetector
from uds.core.ui import theme
from uds.core import VERSION
import uds.web.errors as errors
import logging
logger = logging.getLogger(__name__)
__updated__ = '2015-05-03'
__updated__ = '2015-05-05'
def login(request, tag=None):
@ -120,8 +121,16 @@ def login(request, tag=None):
else:
form = LoginForm(tag=tag)
response = render_to_response(theme.template('login.html'), {'form': form, 'customHtml': GlobalConfig.CUSTOM_HTML_LOGIN.get(True)},
context_instance=RequestContext(request))
response = render_to_response(
theme.template('login.html'),
{
'form': form,
'customHtml': GlobalConfig.CUSTOM_HTML_LOGIN.get(True),
'version': VERSION
},
context_instance=RequestContext(request)
)
getUDSCookie(request, response)