From 663a4c421c0eb6e36c199a815fc90cafd9c646f4 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 25 Jun 2014 15:47:56 +0300 Subject: [PATCH] smb shares UI is now enabled on a per camera basis --- src/config.py | 1 + src/handlers.py | 2 +- static/js/main.js | 7 ++++++- templates/main.html | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/config.py b/src/config.py index 934a77e..bec11d3 100644 --- a/src/config.py +++ b/src/config.py @@ -681,6 +681,7 @@ def camera_dict_to_ui(data): 'rotation': int(data['rotate']), # file storage + 'smb_shares': settings.SMB_SHARES, 'storage_device': data['@storage_device'], 'network_server': data['@network_server'], 'network_share_name': data['@network_share_name'], diff --git a/src/handlers.py b/src/handlers.py index b94062f..fea56a4 100644 --- a/src/handlers.py +++ b/src/handlers.py @@ -142,7 +142,7 @@ class NotFoundHandler(BaseHandler): class MainHandler(BaseHandler): @BaseHandler.auth() def get(self): - self.render('main.html', smb_shares=settings.SMB_SHARES) + self.render('main.html') class ConfigHandler(BaseHandler): diff --git a/static/js/main.js b/static/js/main.js index 0ea3542..bb47f24 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -372,12 +372,16 @@ function updateConfigUi() { } /* storage device */ - if ($('#storageDeviceSelect').val() === 'local-disk') { + var smbShares = $('#storageDeviceSelect').data('smb_shares'); + if ($('#storageDeviceSelect').val() === 'local-disk' || !smbShares) { $('#networkServerEntry').parents('tr:eq(0)').each(markHide); $('#networkUsernameEntry').parents('tr:eq(0)').each(markHide); $('#networkPasswordEntry').parents('tr:eq(0)').each(markHide); $('#networkShareNameEntry').parents('tr:eq(0)').each(markHide); } + if (!smbShares) { + $('#storageDeviceSelect').parents('tr:eq(0)').each(markHide); + } /* auto brightness */ if ($('#autoBrightnessSwitch').get(0).checked) { @@ -675,6 +679,7 @@ function dict2CameraUi(dict) { $('#framerateSlider').val(dict['framerate']); /* file storage */ + $('#storageDeviceSelect').data('smb_shares', dict['smb_shares']); $('#storageDeviceSelect').val(dict['storage_device']); $('#networkServerEntry').val(dict['network_server']); $('#networkShareNameEntry').val(dict['network_share_name']); diff --git a/templates/main.html b/templates/main.html index c45e59d..8ee9873 100644 --- a/templates/main.html +++ b/templates/main.html @@ -152,7 +152,7 @@
File Storage
- + - + - + - + - + -- 2.39.5
Storage Device ?
Network Server ?
Share Name ?
Share Username ?
Share Password ?