Commit 0c721d82 authored by Raph El's avatar Raph El

Modif network

parent a13b4645
...@@ -45,6 +45,8 @@ class NetworkModule extends CWebModule { ...@@ -45,6 +45,8 @@ class NetworkModule extends CWebModule {
// import the module-level models and components // import the module-level models and components
$this->setImport(array( $this->setImport(array(
'citizenToolKit.models.*', 'citizenToolKit.models.*',
'ressources.models.*',
'classifieds.models.*',
$this->id.'.models.*', $this->id.'.models.*',
$this->id.'.components.*', $this->id.'.components.*',
$this->id.'.messages.*', $this->id.'.messages.*',
......
...@@ -2614,7 +2614,7 @@ var directory = { ...@@ -2614,7 +2614,7 @@ var directory = {
if(directory.dirLog) mylog.log("template principal",params,params.type, itemType); if(directory.dirLog) mylog.log("template principal",params,params.type, itemType);
if(domainName=="terla"){ if( typeof domainName != "undefined" && domainName=="terla"){
if(params.type=="circuits") if(params.type=="circuits")
str += directory.circuitPanelHtml(params); str += directory.circuitPanelHtml(params);
else else
......
...@@ -992,6 +992,17 @@ function bindAboutPodElement() { ...@@ -992,6 +992,17 @@ function bindAboutPodElement() {
update["skin[shortDescription]"] = data.skin.title; update["skin[shortDescription]"] = data.skin.title;
update["skin[logo]"] = data.skin.logo; update["skin[logo]"] = data.skin.logo;
update["displayCommunexion"] = dataHelper.stringToBool(data.skin.displayCommunexion); update["displayCommunexion"] = dataHelper.stringToBool(data.skin.displayCommunexion);
//update["add"] = dataHelper.stringToBool(data.skin.add);
update["request[scope]"] = data.request.scope;
update["request[searchType]"] = data.request.searchType;
update["request[searchTag]"] = data.request.searchTag;
update["request[sourceKey]"] = data.request.sourceKey;
dyFObj.openForm( 'network','sub', update); dyFObj.openForm( 'network','sub', update);
} }
}); });
......
...@@ -62,6 +62,8 @@ dynForm = { ...@@ -62,6 +62,8 @@ dynForm = {
if( formData.add && dataHelper.stringToBool(formData.displayCommunexion) ){ if( formData.add && dataHelper.stringToBool(formData.displayCommunexion) ){
formData.add = formData["request[searchType]"]; formData.add = formData["request[searchType]"];
}else{
delete formData.add ;
} }
if( $(dyFObj.activeModal+" #ajaxFormModal request[searchTag]").val() != "" && formData["request[searchTag]"] ) if( $(dyFObj.activeModal+" #ajaxFormModal request[searchTag]").val() != "" && formData["request[searchTag]"] )
...@@ -104,8 +106,11 @@ dynForm = { ...@@ -104,8 +106,11 @@ dynForm = {
"type" : dyFInputs.inputHidden(), "type" : dyFInputs.inputHidden(),
//"name" : dyFInputs.name(), //"name" : dyFInputs.name(),
visible : dyFInputs.inputSelect( "Visibilité du network",
/************************* Skin *****************************/ "Choisir la visibilité du network",
{ public : "public", communuty : "communuty", priver : "priver" },
{ required : true } ),
/************************* Skin *****************************/
skinInfo : { skinInfo : {
inputType : "custom", inputType : "custom",
html:"<p class='item-comment bg-green-comment'>"+tradDynForm["Skin"]+"</p>", html:"<p class='item-comment bg-green-comment'>"+tradDynForm["Skin"]+"</p>",
...@@ -134,7 +139,8 @@ dynForm = { ...@@ -134,7 +139,8 @@ dynForm = {
//add : dyFInputs.tags( ["organization","project","event"], tradDynForm["Allow to add elements"], tradDynForm["Allow to add elements"] ), //add : dyFInputs.tags( ["organization","project","event"], tradDynForm["Allow to add elements"], tradDynForm["Allow to add elements"] ),
/************************* Result *****************************/ /************************* Result *****************************/
requestInfo : { requestInfo : {
inputType : "custom", inputType : "custom",
html:"<p class='item-comment bg-green-comment'>"+tradDynForm["Request Section"]+"</p>", html:"<p class='item-comment bg-green-comment'>"+tradDynForm["Request Section"]+"</p>",
...@@ -144,7 +150,7 @@ dynForm = { ...@@ -144,7 +150,7 @@ dynForm = {
"request[searchTag]" : dyFInputs.tags(tagsList, tradDynForm["Show items that will have the following tags"], tradDynForm["Show items that will have the following tags"] ), "request[searchTag]" : dyFInputs.tags(tagsList, tradDynForm["Show items that will have the following tags"], tradDynForm["Show items that will have the following tags"] ),
"request[sourceKey]" : dyFInputs.tags([], null, tradDynForm["Key used for data import"]) , "request[sourceKey]" : dyFInputs.tags([], null, tradDynForm["Key used for data import"]) ,
/************************* Filter *****************************/ /************************* Filter *****************************/
filterInfo : { filterInfo : {
inputType : "custom", inputType : "custom",
......
...@@ -89,10 +89,10 @@ function autocompleteMultiScope(){ ...@@ -89,10 +89,10 @@ function autocompleteMultiScope(){
$(".addScope").click(function(){ $(".addScope").click(function(){
//if($("#ajaxFormModal").val().length) if($("#ajax-modal").hasClass("in"))
dyFInputs.scopeObj.addScope($(this).data("val"), $(this).data("lbl"), $(this).data("level"), $(this).data("country")); dyFInputs.scopeObj.addScope($(this).data("val"), $(this).data("lbl"), $(this).data("level"), $(this).data("country"));
// else else
// addScopeToMultiscope($(this).data("val"), $(this).data("lbl"), $(this).data("level"), $(this).data("country")); addScopeToMultiscope($(this).data("val"), $(this).data("lbl"), $(this).data("level"), $(this).data("country"));
}); });
}, },
......
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