summaryrefslogtreecommitdiff
path: root/yaksh/static
diff options
context:
space:
mode:
authoradityacp2018-03-22 12:36:45 +0530
committeradityacp2018-03-22 12:36:45 +0530
commit30be89eef46a248fe6f7ff26a923593ea8371fb1 (patch)
tree7af1afd0a403e4c71579f9afe830c482e59c3add /yaksh/static
parente1c1d0d0d6ae170d3ce9966b98ec6d03ff35c062 (diff)
parent4b356aa2f6097cd0f46292218f31ded18b631e53 (diff)
downloadonline_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.tar.gz
online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.tar.bz2
online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.zip
Resolve conflicts and update to latest changes
Diffstat (limited to 'yaksh/static')
-rw-r--r--yaksh/static/yaksh/js/add_question.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/yaksh/static/yaksh/js/add_question.js b/yaksh/static/yaksh/js/add_question.js
index 346991a..0f02aab 100644
--- a/yaksh/static/yaksh/js/add_question.js
+++ b/yaksh/static/yaksh/js/add_question.js
@@ -126,8 +126,9 @@ function textareaformat()
document.getElementById('my').innerHTML = document.getElementById('id_description').value ;
document.getElementById('rend_solution').innerHTML = document.getElementById('id_solution').value ;
+ var question_type = document.getElementById('id_type').value
if (document.getElementById('id_grade_assignment_upload').checked ||
- document.getElementById('id_type').value == 'upload'){
+ question_type == 'upload'){
$("#id_grade_assignment_upload").prop("disabled", false);
}
else{