Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ repos:
- id: eslint
additional_dependencies:
- eslint@8.0.1
- http://diracproject.web.cern.ch/diracproject/externalLibraries/@sencha_eslint-plugin-extjs.7.0.0.tgz
- https://diracproject.web.cern.ch/diracproject/externalLibraries/@sencha_eslint-plugin-extjs.7.0.0.tgz

- repo: https://github.com/ikamensh/flynt/
rev: "0.77"
Expand Down
1 change: 1 addition & 0 deletions src/WebAppDIRAC/Core/App.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def bootstrap(self):
cookie_secret=str(Conf.cookieSecret()),
log_function=self._logRequest,
autoreload=Conf.numProcesses() < 2,
websocket_ping_interval=15,
)

# please do no move this lines. The lines must be before the fork_processes
Expand Down
7 changes: 5 additions & 2 deletions src/WebAppDIRAC/WebApp/handler/ConfigurationManagerHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,11 @@ def __getSubnodesForPath(self, sectionPath, retData):
sectionCfg = self.__configData["cfgData"].getCFG()
for section in [section for section in sectionPath.split("/") if not section.strip() == ""]:
sectionCfg = sectionCfg[section]
except Exception as v:
self.log.exception("Section does not exist", f"{sectionPath} -> {v!r}")
except KeyError as err:
self.log.info("Client requested non-existent section", f"{sectionPath} -> {err!r}")
return False
except Exception as err:
self.log.exception("Error loading config section", f"{sectionPath} -> {err!r}")
return False

for entryName in sectionCfg.listAll():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ Ext.define("Ext.dirac.utils.DiracTimeSearchPanel", {

var iSpanValue = me.cmbTimeSpan.getValue();

if (iSpanValue == null && iSpanValue == 0) {
if (iSpanValue == null || iSpanValue == 0) {
sStartDate = null;
sStartTime = null;
sEndDate = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,12 @@ Ext.define("Ext.dirac.views.tabs.RightContainer", {
layout: "fit",
closable: false,
xtype: "component",
/*
autoEl: {
tag: "iframe",
src: "http://diracgrid.org",
src: "https://diracgrid.org",
},
*/
});
},
getStateData: function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Ext.define("Ext.dirac.views.tabs.TabPanel", {
renderTo: Ext.getBody(),
defaults: {
bodyPadding: 0,
scrollable: true,
scrollable: false,
},
bodyStyle: {
background: "#AAAAAA",
Expand Down
4 changes: 2 additions & 2 deletions src/WebAppDIRAC/WebApp/web.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ WebApp

Schema
{
Help = link|http://dirac.readthedocs.io/en/latest/UserGuide/index.html
Help = link|https://dirac.readthedocs.io/en/latest/UserGuide/index.html
Tools
{
Application Wizard = DIRAC.ApplicationWizard
Expand Down Expand Up @@ -71,7 +71,7 @@ WebApp
#ExampleApp = DIRAC.ExampleApp
}

DIRAC = link|http://diracgrid.org
DIRAC = link|https://diracgrid.org
}

}
Loading