Commit eccf3fec authored by Clément Damiens's avatar Clément Damiens
Browse files

Merge remote-tracking branch 'origin/development' into development

parents ff6f16b6 512a4e97
......@@ -180,15 +180,15 @@ var formObj = {
'</a>';
if(typeof form.active != "undefined" && form.active === true){
if(formCostum == true){
str += '<a href="'+urlCostum+'#answer.index.id.new.form.'+id+'" target="_blanc" class="btn btn-xs btn-primary col-sm-12 bold">'+
'<i class="fa fa-file-text-o"></i> Application Form '+
'</a>';
} else {
// if(formCostum == true){
// str += '<a href="'+urlCostum+'#answer.index.id.new.form.'+id+'" target="_blanc" class="btn btn-xs btn-primary col-sm-12 bold">'+
// '<i class="fa fa-file-text-o"></i> Application Form '+
// '</a>';
// } else {
str += '<a href="javascript:;" data-id="'+id+'" class=" application btn btn-xs btn-primary col-sm-12 bold">'+
'<i class="fa fa-file-text-o"></i> Application Form '+
'</a>';
}
//}
if(typeof form.canEditForm != "undefined" && form.canEditForm === true){
str += '<a href="javascript:;" data-id="'+id+'" class="allAnswers btn btn-xs btn-primary col-sm-12 bold">'+
......@@ -410,14 +410,14 @@ var formObj = {
openSearch :true
},
image : dyFInputs.image(),
tpl : {
inputType : "hidden",
value:"survey.views.tpls.forms.formWizard"
},
answersTpl : {
inputType : "hidden",
value:"survey.views.tpls.forms.answers"
}
// tpl : {
// inputType : "hidden",
// value:"survey.views.tpls.forms.formWizard"
// },
// answersTpl : {
// inputType : "hidden",
// value:"survey.views.tpls.forms.answers"
//}
},
beforeBuild : function(){
dyFObj.setMongoId('forms',function(){
......
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