Commit 872bee84 authored by Raph El's avatar Raph El
Browse files

Hotfix import + invite action

parent 10af8520
......@@ -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);
......
......@@ -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);
}
//}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment