IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added missing dependent javascript 'jquery.aciFragment' required by the

Browse Source 
aciTree.

Also - fixed few CSS specifically for the preferences dialog.
Returning the sorted preferences from the server, so that - it lists
down in correct order.
This commit is contained in:
Ashesh Vashi 2016-04-19 23:46:50 +05:30
parent 37699a9820
commit ef7737c709
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/pgadmin/browser/__init__.py
View File

@ -114,7 +114,18 @@ class BrowserModule(PgAdminModule):
filename='js/aciTree/jquery.aciSortable.min'
),
'deps': ['jquery', 'jquery.aciplugin'],
'exports': 'aciPluginClass.plugins.aciTree',
'exports': 'aciPluginClass.plugins.aciSortable',
'when': None,
'preloaded': True
})
scripts.append({
'name': 'jquery.acifragment',
'path': url_for(
'browser.static',
filename='js/aciTree/jquery.aciFragment.min'
),
'deps': ['jquery', 'jquery.aciplugin'],
'exports': 'aciPluginClass.plugins.aciFragment',
'when': None,
'preloaded': True
})

8
web/pgadmin/preferences/__init__.py
View File

@ -91,6 +91,9 @@ def preferences():
preferences = Preferences.preferences()
res = []
def label(p):
return p['label']
for m in preferences:
if len(m['categories']):
om = {
@ -108,15 +111,16 @@ def preferences():
"label": c['label'],
"inode": False,
"open": False,
"preferences": c['preferences']
"preferences": sorted(c['preferences'], key=label)
}
(om['branch']).append(oc)
om['branch'] = sorted(om['branch'], key=label)
res.append(om)
return ajax_response(
response=res,
response=sorted(res, key=label),
status=200
)

14
web/pgadmin/preferences/static/css/preferences.css
View File

@ -1,11 +1,8 @@
.preferences_dialog {
height: 100%;
position: absolute;
top: 5px;
left: 0px;
bottom: 0px;
right: 0px;
padding-bottom: 30px;
width: 100%;
padding-top: 34px;
padding-bottom: 39px;
}
.preferences_tree{
@ -23,6 +20,11 @@
overflow: auto;
}
div.pgadmin-preference-body div.ajs-content {
top: 0px !important;
bottom: 0px !important;
}
.preferences_content .control-label, .preferences_content .pgadmin-controls {
min-width: 100px !important;
}