Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
2ddad386
Commit
2ddad386
authored
Jul 13, 2020
by
Piotr Gawron
Browse files
possibility to customize email title
parent
756a6c3c
Pipeline
#29748
canceled with stage
in 1 minute and 54 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
2ddad386
...
...
@@ -29,6 +29,8 @@ minerva (15.1.0) unstable; urgency=medium
to
SBGN
-
ML
PD
(#
1320
)
*
Small
improvement
:
SBGN
notes
are
imported
properly
(#
1319
)
*
Small
improvement
:
SBGN
notes
are
exported
properly
(#
1319
)
*
Small
improvement
:
possibility
to
customize
request
account
email
title
(#
1330
)
*
Bug
fix
:
export
to
image
from
selected
polygon
contained
all
elements
inside
rectangle
bounded
by
the
polygon
coordinates
(#
1096
)
*
Bug
fix
:
continuous
refreshing
list
of
project
when
uploading
/
removing
...
...
frontend-js/src/main/js/ConfigurationType.js
View file @
2ddad386
...
...
@@ -17,6 +17,7 @@ var ConfigurationType = {
OVERLAY_OPACITY
:
"
OVERLAY_OPACITY
"
,
REQUEST_ACCOUNT_EMAIL
:
"
REQUEST_ACCOUNT_EMAIL
"
,
REQUEST_ACCOUNT_DEFAULT_CONTENT
:
"
REQUEST_ACCOUNT_DEFAULT_CONTENT
"
,
REQUEST_ACCOUNT_DEFAULT_TITLE
:
"
REQUEST_ACCOUNT_DEFAULT_TITLE
"
,
RIGHT_LOGO_IMG
:
"
RIGHT_LOGO_IMG
"
,
RIGHT_LOGO_LINK
:
"
RIGHT_LOGO_LINK
"
,
RIGHT_LOGO_TEXT
:
"
RIGHT_LOGO_TEXT
"
,
...
...
frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
View file @
2ddad386
...
...
@@ -465,17 +465,13 @@ ProjectInfoPanel.prototype.showUserProfilePage = function (user) {
*/
ProjectInfoPanel
.
prototype
.
init
=
function
()
{
var
self
=
this
;
var
email
,
content
;
return
self
.
getServerConnector
().
getConfigurationParam
(
ConfigurationType
.
REQUEST_ACCOUNT_EMAIL
).
then
(
function
(
result
)
{
email
=
result
;
return
self
.
getServerConnector
().
getConfigurationParam
(
ConfigurationType
.
REQUEST_ACCOUNT_DEFAULT_CONTENT
);
}).
then
(
function
(
result
)
{
content
=
encodeURIComponent
(
result
);
var
url
=
'
mailto:
'
+
email
+
'
?subject=MINERVA account request&body=
'
+
content
;
var
link
=
$
(
"
[name=requestAccount]
"
,
self
.
getElement
());
link
.
attr
(
"
href
"
,
url
);
return
self
.
getServerConnector
().
getLoggedUser
()
}).
then
(
function
(
user
)
{
var
email
=
self
.
getConfiguration
().
getOption
(
ConfigurationType
.
REQUEST_ACCOUNT_EMAIL
).
getValue
();
var
content
=
encodeURIComponent
(
self
.
getConfiguration
().
getOption
(
ConfigurationType
.
REQUEST_ACCOUNT_DEFAULT_CONTENT
).
getValue
());
var
title
=
self
.
getConfiguration
().
getOption
(
ConfigurationType
.
REQUEST_ACCOUNT_DEFAULT_TITLE
).
getValue
();
var
url
=
'
mailto:
'
+
email
+
'
?subject=
'
+
title
+
'
&body=
'
+
content
;
var
link
=
$
(
"
[name=requestAccount]
"
,
self
.
getElement
());
link
.
attr
(
"
href
"
,
url
);
return
self
.
getServerConnector
().
getLoggedUser
().
then
(
function
(
user
)
{
console
.
log
(
user
.
isConnectedToLdap
());
if
(
!
user
.
isConnectedToLdap
())
{
var
logoutButton
=
self
.
getControlElement
(
PanelControlElementType
.
USER_TAB_LOGOUT_BUTTON
);
...
...
frontend-js/src/main/js/minerva.js
View file @
2ddad386
...
...
@@ -764,7 +764,7 @@ function createLoginDiv(configuration) {
title
:
"
Reset password
"
,
width
:
320
,
height
:
120
,
modal
:
true
,
modal
:
true
,
close
:
function
()
{
$
(
content
).
dialog
(
"
destroy
"
);
dataTable
.
destroy
();
...
...
@@ -867,13 +867,16 @@ function createLoginDiv(configuration) {
});
});
$
(
'
#register_button
'
,
result
).
click
(
function
()
{
var
email
,
content
;
var
email
,
content
,
title
;
return
ServerConnector
.
getConfigurationParam
(
ConfigurationType
.
REQUEST_ACCOUNT_EMAIL
).
then
(
function
(
result
)
{
email
=
result
;
return
ServerConnector
.
getConfigurationParam
(
ConfigurationType
.
REQUEST_ACCOUNT_DEFAULT_TITLE
);
}).
then
(
function
(
result
)
{
title
=
result
;
return
ServerConnector
.
getConfigurationParam
(
ConfigurationType
.
REQUEST_ACCOUNT_DEFAULT_CONTENT
);
}).
then
(
function
(
result
)
{
content
=
encodeURIComponent
(
result
);
document
.
location
.
href
=
'
mailto:
'
+
email
+
'
?subject=
MINERVA account request
&body=
'
+
content
;
document
.
location
.
href
=
'
mailto:
'
+
email
+
'
?subject=
'
+
title
+
'
&body=
'
+
content
;
});
});
...
...
model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java
View file @
2ddad386
...
...
@@ -361,6 +361,10 @@ public enum ConfigurationElementType {
MINERVA_ROOT
(
"Minerva root url"
,
""
,
ConfigurationElementEditType
.
URL
,
false
,
ConfigurationElementTypeGroup
.
SERVER_CONFIGURATION
),
REQUEST_ACCOUNT_DEFAULT_TITLE
(
"Email title used for requesting an account"
,
"MINERVA account request"
,
ConfigurationElementEditType
.
STRING
,
false
,
ConfigurationElementTypeGroup
.
EMAIL_NOTIFICATION
),
;
/**
...
...
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