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

Merge remote-tracking branch 'origin/v2.2'

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-11-27 11:18:14 +01:00
commit 696ad047a3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/uds/web/util/services.py
View File

@ -25,25 +25,34 @@
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
""" '''
@author: Adolfo Gómez, dkmaster at dkmon dot com @author: Adolfo Gómez, dkmaster at dkmon dot com
""" '''
from __future__ import unicode_literals from __future__ import unicode_literals
from django.urls import reverse from django.shortcuts import render_to_response
from django.shortcuts import render
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext from django.utils.translation import ugettext
from django.utils import formats from django.utils import formats
from django.template import RequestContext
from uds.core.auths.auth import webLoginRequired, webLogout
from uds.models import DeployedService, Transport, UserService, Network, ServicesPoolGroup from uds.models import DeployedService, Transport, UserService, Network, ServicesPoolGroup
from uds.core.util.Config import GlobalConfig from uds.core.util.Config import GlobalConfig
from uds.core.util import html from uds.core.util import html
from uds.core.ui import theme
from uds.core.managers.UserServiceManager import UserServiceManager from uds.core.managers.UserServiceManager import UserServiceManager
from uds.core import VERSION, VERSION_STAMP
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__updated__ = '2018-03-14'
def getServicesData(request): def getServicesData(request):
# Session data # Session data
@ -189,7 +198,8 @@ def getServicesData(request):
logger.debug('Services: {0}'.format(services)) logger.debug('Services: {0}'.format(services))
services = sorted(services, key=lambda s: s['name'].upper()) # Sort services and remove services with no transports...
services = [s for s in sorted(services, key=lambda s: s['name'].upper()) if len(s['transports']) > 0]
autorun = False autorun = False
if len(services) == 1 and GlobalConfig.AUTORUN_SERVICE.getBool(True) and len(services[0]['transports']) > 0: if len(services) == 1 and GlobalConfig.AUTORUN_SERVICE.getBool(True) and len(services[0]['transports']) > 0: