Merge branch 'master' of https://github.com/FOSSEE/online_test into improve-code-server

Conflicts Resolved:
	.travis.yml
	yaksh/views.py

1 files changed, 11 insertions, 1 deletions

diff --git a/yaksh/static/yaksh/js/show_question.js b/yaksh/static/yaksh/js/show_question.js
index e7cd817..e6825a0 100644
--- a/yaksh/static/yaksh/js/show_question.js
+++ b/yaksh/static/yaksh/js/show_question.js
@@ -37,7 +37,17 @@ function confirm_edit(frm)
     else
         return true;
 }
+
+function append_tag(tag){
+    var tag_name = document.getElementById("question_tags");
+    if (tag_name.value != null){
+        tag_name.value = tag.value+", "+tag_name.value;
+    }
+    else{
+        tag_name.value = tag.value;
+    }
+}
 $(document).ready(function()
     { 
         $("#questions-table").tablesorter({sortList: [[0,0], [4,0]]});
-    });
\ No newline at end of file
+    });