Commit 341ed31b authored by Raph El's avatar Raph El
Browse files

Merge branch 'development' of https://gitlab.adullact.net/pixelhumain/survey into development

parents f1284539 c90f5779
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
'index' => 'survey.controllers.answer.IndexAction', 'index' => 'survey.controllers.answer.IndexAction',
'all'=>'survey.controllers.answer.AllAction', 'all'=>'survey.controllers.answer.AllAction',
'admindirectory'=>'survey.controllers.answer.admin.DirectoryAction', 'admindirectory'=>'survey.controllers.answer.admin.DirectoryAction',
'forms' => 'survey.controllers.answer.OformsAction', 'get' => 'survey.controllers.answer.GetAction',
'all' => 'survey.controllers.answer.AllAction',
); );
} }
} }
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
return array( return array(
'create' => 'survey.controllers.openForm.CreateAction', 'create' => 'survey.controllers.openForm.CreateAction',
'edit'=> 'survey.controllers.openForm.EditAction', 'edit'=> 'survey.controllers.openForm.EditAction',
'get' => 'survey.controllers.openForm.GetAction',
); );
} }
} }
<?php <?php
class AllAction extends CTKAction class GetAction extends CTKAction
{ {
//if $slug : getd all the forms for an element.slug //if $slug : getd all the forms for an element.slug
//if $id : opens the forms //if $id : opens the forms
......
<?php <?php
class OformsAction extends CTKAction class GetAction extends CTKAction
{ {
//if $slug : getd all the forms for an element.slug //if $slug : getd all the forms for an element.slug
//if $id : opens the forms //if $id : opens the forms
......
...@@ -45,7 +45,7 @@ jQuery(document).ready(function() { ...@@ -45,7 +45,7 @@ jQuery(document).ready(function() {
mylog.log("render","/modules/costum/views/tpls/forms/cplx/answers.php"); mylog.log("render","/modules/costum/views/tpls/forms/cplx/answers.php");
$('.showAnswersBtn').off().on("click",function() { $('.showAnswersBtn').off().on("click",function() {
getAjax("#central-container",baseUrl+"/survey/answer/all/form/"+$(this).data("id"),function(){ getAjax("#central-container",baseUrl+"/survey/answer/get/form/"+$(this).data("id"),function(){
},"html"); },"html");
}); });
...@@ -187,5 +187,5 @@ var oformParams = { ...@@ -187,5 +187,5 @@ var oformParams = {
} }
} }
}; };
//use id type
</script> </script>
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