Commit 67761a9f authored by Raph El's avatar Raph El
Browse files

Hotfix

parent fd22df6b
......@@ -1847,7 +1847,7 @@ var directory = {
params.urlParent = (notEmpty(params.parentType) && notEmpty(params.parentId)) ?
'#page.type.'+params.parentType+'.id.' + params.parentId : "";
if( params.type == "poi" && params.source.insertOrign == "import") {
if( params.type == "poi" && params.source && params.source.insertOrign == "import") {
var interop_type = getTypeInteropData(params.source.key);
params.hash = getUrlForInteropDirectoryElements(interop_type, params.shortDescription, params.url);
params.url = params.hash;
......
......@@ -812,6 +812,7 @@ function getImageIcoForInteropElements(type_elt) {
var icon_image = "";
var baseUrlJustForThis = baseUrl.substring(0,baseUrl.length-2);
var baseUrlJustForThis = "";
if (type_elt == "datanova") {
icon_image = "<img width=100 style='margin-top:20px;' src='"+baseUrlJustForThis+moduleUrl+"/images/logos/logo-laposte.png'>";
......
......@@ -131,9 +131,15 @@ function showEmptyMsg(){
var c=0;
if(typeof myMultiScopes != "undefined")
$.each(myMultiScopes, function(key, value){ c++; });
console.log("showEmptyMsg", c);
if(c==0) $("#modalScopes .visible-empty").show(); else $("#modalScopes .visible-empty").hide();
if(c==0) $("#modalScopes .hidden-empty").hide(); else $("#modalScopes .hidden-empty").show();
mylog.log("showEmptyMsg", c);
if(c==0)
$("#modalScopes .visible-empty").show();
else
$("#modalScopes .visible-empty").hide();
if(c==0)
$("#modalScopes .hidden-empty").hide();
else
$("#modalScopes .hidden-empty").show();
//c=0; $.each(myMultiTags, function(key, value){ c++; });
//if(c==0) $("#dropdown-multi-tag .visible-empty").show(); else $("#dropdown-multi-tag .visible-empty").hide();
......
......@@ -3,7 +3,9 @@ function scopeExists(scopeValue){
return typeof myMultiScopes[scopeValue] != "undefined";
}
function saveMultiScope(){ mylog.log("saveMultiScope() try - userId = ",userId); mylog.dir(myMultiScopes);
function saveMultiScope(){
mylog.log("saveMultiScope() try - userId = ", userId);
mylog.dir(myMultiScopes);
hideSearchResults();
if(userId != null && userId != ""){
if(!notEmpty(myMultiScopes)) myMultiScopes = {};
......@@ -19,8 +21,6 @@ function saveMultiScope(){ mylog.log("saveMultiScope() try - userId = ",userId);
mylog.log("Une erreur est survenue pendant l'enregistrement des scopes");
}
});
}else{
}
showCountScope();
......@@ -111,6 +111,7 @@ function loadMultiScopes(){
}
function showCountScope(){
mylog.log("showCountScope");
var count = 0;
var types = new Array("city", "cp", "level1", "level2", "level3", "level4");
//mylog.log("showCountScope");
......@@ -142,7 +143,8 @@ function selectAllScopes(select){
});
saveMultiScope();
}
function showScopeInMultiscope(scopeValue){ //mylog.log("showScopeInMultiscope()", scopeValue);
function showScopeInMultiscope(scopeValue){
mylog.log("showScopeInMultiscope()", scopeValue);
var html = "";
if(scopeExists(scopeValue)){
var scope = myMultiScopes[scopeValue];
......@@ -166,7 +168,7 @@ function showScopeInMultiscope(scopeValue){ //mylog.log("showScopeInMultiscope()
'</span>';
var levelType = ( (scope.type == "zone") ? "level"+scope.level : scope.type ) ;
mylog.log("levelType", levelType);
mylog.log("levelType", levelType, "#multi-scope-list-"+levelType);
$("#multi-scope-list-"+levelType).append(html);
$("#multi-scope-list-"+levelType).show();
......@@ -188,7 +190,8 @@ function showScopeInMultiscope(scopeValue){ //mylog.log("showScopeInMultiscope()
function addScopeToMultiscope(scopeValue, scopeName, scopeLevel){
mylog.log("addScopeToMultiscope", scopeValue, scopeName);
if(scopeValue == "") return;
if(!scopeExists(scopeValue)){ //mylog.log("adding", scopeValue);
if(!scopeExists(scopeValue)){
mylog.log("adding", scopeValue);
var scopeType = currentScopeType;
myMultiScopes[scopeValue] = { name: scopeName, active: true, type: scopeType };
if(notEmpty(scopeLevel)){
......@@ -202,8 +205,8 @@ function addScopeToMultiscope(scopeValue, scopeName, scopeLevel){
scopeType = "level4";
myMultiScopes[scopeValue].level = scopeLevel ;
}
myMultiScopes[scopeValue].type = scopeType ;
//myMultiScopes[scopeValue].type = scopeType ;
mylog.log("myMultiScopes")
//alert();
showScopeInMultiscope(scopeValue);
$("#input-add-multi-scope").val("");
......
......@@ -2772,6 +2772,8 @@ if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )){
}
public function actionLevel234(){
//if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )){
ini_set('memory_limit', '-1');
......
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