Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Devrim Gunyel
core
Commits
242a377a
Commit
242a377a
authored
Nov 05, 2019
by
Piotr Gawron
Browse files
order in databasle is preserved in user preferences
parent
4e9c3f5e
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
242a377a
minerva
(
15.0.0
~
alpha
.1
)
stable
;
urgency
=
medium
*
Small
improvement
:
sort
order
of
tables
in
admin
panel
is
preserved
among
sessions
(#
836
)
minerva
(
15.0.0
~
alpha
.0
)
stable
;
urgency
=
medium
*
Improvement
:
logs
provided
for
validation
data
model
are
structurized
(#
325
)
*
Improvement
:
import
/
export
of
GPML
implemented
...
...
@@ -19,6 +23,8 @@ minerva (15.0.0~alpha.0) stable; urgency=medium
file
(#
671
)
*
Bug
fix
:
problematic
notes
doesn
't crash CellDesigner upload (#968)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 4 Nov 2019 11:00:00 +0200
minerva (14.0.3) stable; urgency=medium
* Bug fix: default zoom level on main map works even when x or y are
undefined (#993)
...
...
frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
View file @
242a377a
...
...
@@ -141,7 +141,7 @@ ConfigurationAdminPanel.prototype.createOptionsTable = function (options, type)
self
.
getGuiUtils
().
addTab
(
self
,
{
name
:
type
,
content
:
configurationDiv
});
return
self
.
bindUserGuiPreference
({
return
Promise
.
all
([
self
.
bindUserGuiPreference
({
jQueryObject
:
$
(
configurationTable
),
event
:
'
length.dt
'
,
preferenceName
:
'
admin-configuration-datatable-length
'
,
...
...
@@ -152,7 +152,26 @@ ConfigurationAdminPanel.prototype.createOptionsTable = function (options, type)
setter
:
function
(
value
)
{
return
$
(
configurationTable
).
DataTable
().
page
.
len
(
value
).
draw
();
}
});
}),
self
.
bindUserGuiPreference
({
jQueryObject
:
$
(
configurationTable
),
event
:
'
order.dt
'
,
preferenceName
:
'
admin-configuration-
'
+
type
+
'
-datatable-order
'
,
defaultValue
:
'
0-asc
'
,
getter
:
function
()
{
var
order
=
$
(
configurationTable
).
DataTable
().
order
();
return
order
[
0
][
0
]
+
"
-
"
+
order
[
0
][
1
];
},
setter
:
function
(
value
)
{
var
tmp
=
value
.
split
(
"
-
"
);
var
column
=
parseInt
(
tmp
[
0
]);
var
order
=
tmp
[
1
];
if
(
Functions
.
isInt
(
column
)
&&
(
order
===
"
asc
"
||
order
===
"
desc
"
))
{
return
$
(
configurationTable
).
DataTable
().
order
([
column
,
order
]).
draw
();
}
else
{
logger
.
warn
(
"
Invalid order:
"
+
column
+
"
;
"
+
order
);
}
}
})]);
};
/**
...
...
frontend-js/src/main/js/gui/admin/GenomeAdminPanel.js
View file @
242a377a
...
...
@@ -177,6 +177,30 @@ GenomeAdminPanel.prototype.init = function () {
}
else
{
self
.
disablePanel
(
"
You have no privilege to manage genomes
"
);
}
}).
then
(
function
()
{
var
genomesTable
=
$
(
"
[name='genomeTable']
"
,
self
.
getElement
())[
0
];
return
self
.
bindUserGuiPreference
({
jQueryObject
:
$
(
genomesTable
),
event
:
'
order.dt
'
,
preferenceName
:
'
admin-genome-datatable-order
'
,
defaultValue
:
'
0-asc
'
,
getter
:
function
()
{
var
order
=
$
(
genomesTable
).
DataTable
().
order
();
return
order
[
0
][
0
]
+
"
-
"
+
order
[
0
][
1
];
},
setter
:
function
(
value
)
{
var
tmp
=
value
.
split
(
"
-
"
);
var
column
=
parseInt
(
tmp
[
0
]);
var
order
=
tmp
[
1
];
if
(
Functions
.
isInt
(
column
)
&&
(
order
===
"
asc
"
||
order
===
"
desc
"
))
{
return
$
(
genomesTable
).
DataTable
().
order
([
column
,
order
]).
draw
();
}
else
{
logger
.
warn
(
"
Invalid order:
"
+
column
+
"
;
"
+
order
);
}
}
});
});
};
...
...
@@ -267,7 +291,7 @@ GenomeAdminPanel.prototype.destroy = function () {
/**
*
* @param {ReferenceGenome} [genome]
* @returns {Promise}
* @returns {Promise
<EditGenomeDialog>
}
*/
GenomeAdminPanel
.
prototype
.
getDialog
=
function
(
genome
)
{
var
self
=
this
;
...
...
frontend-js/src/main/js/gui/admin/PluginAdminPanel.js
View file @
242a377a
...
...
@@ -150,6 +150,29 @@ PluginAdminPanel.prototype.init = function () {
}
else
{
self
.
disablePanel
(
"
You have no privilege to manage plugins
"
);
}
}).
then
(
function
()
{
var
pluginsTable
=
$
(
"
[name='pluginsTable']
"
,
self
.
getElement
())[
0
];
return
self
.
bindUserGuiPreference
({
jQueryObject
:
$
(
pluginsTable
),
event
:
'
order.dt
'
,
preferenceName
:
'
admin-plugins-datatable-order
'
,
defaultValue
:
'
0-asc
'
,
getter
:
function
()
{
var
order
=
$
(
pluginsTable
).
DataTable
().
order
();
return
order
[
0
][
0
]
+
"
-
"
+
order
[
0
][
1
];
},
setter
:
function
(
value
)
{
var
tmp
=
value
.
split
(
"
-
"
);
var
column
=
parseInt
(
tmp
[
0
]);
var
order
=
tmp
[
1
];
if
(
Functions
.
isInt
(
column
)
&&
(
order
===
"
asc
"
||
order
===
"
desc
"
))
{
return
$
(
pluginsTable
).
DataTable
().
order
([
column
,
order
]).
draw
();
}
else
{
logger
.
warn
(
"
Invalid order:
"
+
column
+
"
;
"
+
order
);
}
}
});
});
};
...
...
frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
View file @
242a377a
...
...
@@ -265,6 +265,30 @@ UsersAdminPanel.prototype.init = function () {
}
else
{
self
.
disablePanel
(
"
You have no privilege to manage users
"
);
}
}).
then
(
function
()
{
var
usersTable
=
$
(
"
[name='usersTable']
"
,
self
.
getElement
())[
0
];
return
self
.
bindUserGuiPreference
({
jQueryObject
:
$
(
usersTable
),
event
:
'
order.dt
'
,
preferenceName
:
'
admin-users-datatable-order
'
,
defaultValue
:
'
0-asc
'
,
getter
:
function
()
{
var
order
=
$
(
usersTable
).
DataTable
().
order
();
return
order
[
0
][
0
]
+
"
-
"
+
order
[
0
][
1
];
},
setter
:
function
(
value
)
{
var
tmp
=
value
.
split
(
"
-
"
);
var
column
=
parseInt
(
tmp
[
0
]);
var
order
=
tmp
[
1
];
if
(
Functions
.
isInt
(
column
)
&&
(
order
===
"
asc
"
||
order
===
"
desc
"
))
{
return
$
(
usersTable
).
DataTable
().
order
([
column
,
order
]).
draw
();
}
else
{
logger
.
warn
(
"
Invalid order:
"
+
column
+
"
;
"
+
order
);
}
}
});
});
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment