Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Jean-Baptiste HUBER
co2
Commits
872bee84
Commit
872bee84
authored
Feb 08, 2019
by
Raph El
Browse files
Hotfix import + invite action
parent
10af8520
Changes
2
Hide whitespace changes
Inline
Side-by-side
views/adminpublic/createfile.php
View file @
872bee84
...
...
@@ -1037,8 +1037,11 @@ function createStepTwo(data){
$(
"
#
divUpdate
"
).hide();
}
var nameUpdate = '<input type=
"
text
"
name=
"
nameMappingUpdate
"
id=
"
nameMappingUpdate
"
value='+data.mapping.name+'>';
$(
"
#
divSaisirNameUpdate
"
).html(nameUpdate);
if(typeof data.mapping !=
"
undefined
"
&& typeof data.mapping.name !=
"
undefined
"
){
var nameUpdate = '<input type=
"
text
"
name=
"
nameMappingUpdate
"
id=
"
nameMappingUpdate
"
value='+data.mapping.name+'>';
$(
"
#
divSaisirNameUpdate
"
).html(nameUpdate);
}
//mylog.log(
"
listElt
"
,listElt);
...
...
views/element/invite.php
View file @
872bee84
...
...
@@ -150,6 +150,8 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
echo
Yii
::
t
(
"common"
,
"Invite people on"
)
;
else
if
(
$parentType
==
Project
::
COLLECTION
)
echo
Yii
::
t
(
"common"
,
'Invite contributors on'
)
;
else
if
(
$parentType
==
Action
::
COLLECTION
)
echo
Yii
::
t
(
"common"
,
'Assigner une personne'
)
;
else
echo
Yii
::
t
(
"common"
,
"Invite members on"
);
?>
...
...
@@ -327,8 +329,10 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
jQuery
(
document
).
ready
(
function
()
{
// mylog.log("members", members);
if
(
parentType
!=
"
citoyens
"
&&
typeof
contextData
!=
"
undefined
"
&&
contextData
!=
null
)
if
(
parentType
!=
"
citoyens
"
&&
typeof
contextData
!=
"
undefined
"
&&
contextData
!=
null
){
var
name
=
(
typeof
contextData
.
name
!=
"
undefined
"
?
contextData
.
name
:
contextData
.
title
);
$
(
"
#title-invite .name-parent
"
).
text
(
contextData
.
name
);
}
initInvite
();
bindInvite
();
fadeInView
(
"
step1-search
"
);
...
...
@@ -571,8 +575,8 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
success
:
function
(
data
){
if
(
parentType
==
"
actions
"
){
toastr
.
info
(
trad
[
"
processing
"
]);
//
if(parentType == "actions"){
//
toastr.info(trad["processing"]);
// var idProposal = $(this).data("id-action");
// uiCoop.getCoopData(parentType, parentId, "action", null, idProposal,
// function(){
...
...
@@ -582,7 +586,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
// }, false);
// $(".close-modal").trigger("click");
// $(".load-data-community").trigger("click");
}
else
{
//
} else {
mylog
.
log
(
"
link/multiconnect success
"
,
data
);
var
nbInvites
=
data
.
length
;
var
str
=
""
;
...
...
@@ -664,7 +668,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
initListInvite
();
fadeInView
(
"
result
"
);
$
(
"
#modal-invite #dropdown-result
"
).
html
(
str
);
}
//
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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