Merge pull request #11 from MetalBlazer/foss_category_table_call

Foss Category : call from table , static html removed

Author: kirti3192

forums/config.sample.py

@@ -261,56 +261,9 @@ <h5>Move the question to:</h5>
             <div class="row">
                 <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
                     <select id="id_category" class="form-control">
-                        <option value="Advanced-C++">Advanced-C++</option>
-                        <option value="BASH">BASH</option>
-                        <option value="Blender">Blender</option>
-                        <option value="C-and-C++">C-and-C++</option>
-                        <option value="CellDesigner">CellDesigner</option>
-                        <option value="Digital-Divide">Digital-Divide</option>
-                        <option value="Drupal">Drupal</option>
-                        <option value="Firefox">Firefox</option>
-                        <option value="GChemPaint">GChemPaint</option>
-                        <option value="Geogebra">Geogebra</option>
-                        <option value="GeoGebra-for-Engineering-drawing">GeoGebra-for-Engineering-drawing</option>
-                        <option value="GIMP">GIMP</option>
-                        <option value="GNS3">GNS3</option>
-                        <option value="GSchem">GSchem</option>
-                        <option value="Inkscape">Inkscape</option>
-                        <option value="Java">Java</option>
-                        <option value="Java-Business-Application">Java-Business-Application</option>
-                        <option value="KiCad">KiCad</option>
-                        <option value="KTouch">KTouch</option>
-                        <option value="KTurtle">KTurtle</option>
-                        <option value="LaTeX">LaTeX</option>
-                        <option value="LibreOffice-Suite-Base">LibreOffice-Suite-Base</option>
-                        <option value="LibreOffice-Suite-Calc">LibreOffice-Suite-Calc</option>
-                        <option value="LibreOffice-Suite-Draw">LibreOffice-Suite-Draw</option>
-                        <option value="LibreOffice-Suite-Impress">LibreOffice-Suite-Impress</option>
-                        <option value="LibreOffice-Suite-Math">LibreOffice-Suite-Math</option>
-                        <option value="LibreOffice-Suite-Writer">LibreOffice-Suite-Writer</option>
-                        <option value="Linux">Linux</option>
-                        <option value="Netbeans">Netbeans</option>
-                        <option value="Ngspice">Ngspice</option>
-                        <option value="OpenFOAM">OpenFOAM</option>
-                        <option value="Orca">Orca</option>
-                        <option value="Oscad">Oscad</option>
-                        <option value="PERL">PERL</option>
-                        <option value="PHP-and-MySQL">PHP-and-MySQL</option>
-                        <option value="Python">Python</option>
-                        <option value="Python-Old-Version">Python-Old-Version</option>
-                        <option value="QCad">QCad</option>
-                        <option value="R">R</option>
-                        <option value="Ruby">Ruby</option>
-                        <option value="Scilab">Scilab</option>
-                        <option value="Selenium">Selenium</option>
-                        <option value="Single-Board-Heater-System">Single-Board-Heater-System</option>
-                        <option value="Spoken-Tutorial-Technology">Spoken-Tutorial-Technology</option>
-                        <option value="Step">Step</option>
-                        <option value="Thunderbird">Thunderbird</option>
-                        <option value="Tux-Typing">Tux-Typing</option>
-                        <option value="What-is-Spoken-Tutorial">What-is-Spoken-Tutorial</option>
-                        <option value="Xfig">Xfig</option>
-                        <option value="General">General FOSS</option>
+                        {%for a_foss in category %}
+                        <option value={{a_foss.foss.id}}>{{a_foss.foss}}</option>
+                        {% endfor %}
                     </select>
                 </div>
                 <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">

static/website/templates/get-question.html

@@ -15,6 +15,7 @@
 from website.helpers import get_video_info, prettify
 from forums.config import VIDEO_PATH
 from website.templatetags.permission_tags import can_edit
+from spoken_auth.models import FossCategory
 
 User = get_user_model()
 categories = []
@@ -71,13 +72,15 @@ def hidden_questions(request):
 def get_question(request, question_id=None, pretty_url=None):
     question = get_object_or_404(Question, id=question_id)
     pretty_title = prettify(question.title)
+    category = FossCategory.objects.all().order_by('foss')
     if pretty_url != pretty_title:
         return HttpResponseRedirect('/question/' + question_id + '/' + pretty_title)
     answers = question.answer_set.all()
     form = AnswerQuesitionForm()
     context = {
         'question': question,
         'answers': answers,
+        'category': category,
         'form': form
     }
     context.update(csrf(request))