Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into rfq-email

Browse Source
This commit is contained in:
Marica 2020-09-29 11:56:44 +05:30 committed by GitHub
commit e5a60f1cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/education/doctype/question/question.json
View File

@ -13,7 +13,7 @@
"fields": [ "fields": [
{ {
"fieldname": "question", "fieldname": "question",
"fieldtype": "Small Text", "fieldtype": "Text Editor",
"in_list_view": 1, "in_list_view": 1,
"label": "Question", "label": "Question",
"reqd": 1 "reqd": 1
@ -34,7 +34,7 @@
"read_only": 1 "read_only": 1
} }
], ],
"modified": "2019-05-30 18:39:21.880974", "modified": "2020-09-24 18:39:21.880974",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Question", "name": "Question",
@ -77,4 +77,4 @@
"quick_entry": 1, "quick_entry": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC"
} }

6
erpnext/education/doctype/quiz_question/quiz_question.json
View File

@ -20,14 +20,14 @@
{ {
"fetch_from": "question_link.question", "fetch_from": "question_link.question",
"fieldname": "question", "fieldname": "question",
"fieldtype": "Data", "fieldtype": "Text Editor",
"in_list_view": 1, "in_list_view": 1,
"label": "Question", "label": "Question",
"read_only": 1 "read_only": 1
} }
], ],
"istable": 1, "istable": 1,
"modified": "2019-06-12 12:24:02.312577", "modified": "2020-09-24 12:24:02.312577",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Quiz Question", "name": "Quiz Question",
@ -37,4 +37,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }

2
erpnext/public/js/education/lms/quiz.js
View File

@ -140,7 +140,7 @@ class Question {
make_question() { make_question() {
let question_wrapper = document.createElement('h5'); let question_wrapper = document.createElement('h5');
question_wrapper.classList.add('mt-3'); question_wrapper.classList.add('mt-3');
question_wrapper.innerText = this.question; question_wrapper.innerHTML = this.question;
this.wrapper.appendChild(question_wrapper); this.wrapper.appendChild(question_wrapper);
} }