Fix for #326 - Docker Export XML

moloch-- · Jan 6, 2020 · 73013ba · 73013ba
1 parent 0db883b
commit 73013ba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/models/Box.py b/models/Box.py
@@ -321,7 +321,7 @@ def to_xml(self, parent):
             self.flag_submission_type
         ).name
         ET.SubElement(box_elem, "difficulty").text = self._difficulty
-        ET.SubElement(box_elem, "garbage").text = self.garbage
+        ET.SubElement(box_elem, "garbage").text = str(self.garbage)
         if self.category_id:
             ET.SubElement(box_elem, "category").text = Category.by_id(
                 self.category_id

diff --git a/setup/__init__.py b/setup/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "3.3.4"
+__version__ = "3.3.5"
diff --git a/templates/admin/create/game_level.html b/templates/admin/create/game_level.html
@@ -29,7 +29,7 @@ <h4 class="alert-heading">{{_("ERROR")}}</h4>
             <div class="control-group">
                 <label class="control-label" for="level_number">{{_("Level Number")}}</label>
                 <div class="controls">
-                    <input autofocus required id="level-number" name="level_number" type="text" pattern="[0-9]+" placeholder="{{_('Level Number')}}"
+                    <input autofocus required id="level-number" name="level_number" type="number" min=1 pattern="[0-9]+" placeholder="{{_('Level Number')}}"
                             rel="popover"
                             data-original-title="{{_('Level Number')}}"
                             data-content="{{_('Number of new Level')}} [0-9]+ {{_('Must be unique')}}" />
@@ -38,7 +38,7 @@ <h4 class="alert-heading">{{_("ERROR")}}</h4>
             <div class="control-group">
                 <label class="control-label" for="game_level-name">{{_("Level Name")}}</label>
                 <div class="controls">
-                    <input id="game_level-name" name="name" placeholder="{{_('Level Name')}}" maxlength=32 
+                    <input id="game_level-name" name="name" placeholder="{{_('Level Name')}}" maxlength=32 type="text"
                         rel="popover"
                         data-original-title="{{_('Level Name')}}"
                         data-content="({{_('Optional')}}) {{_('defaults to')}} &#34;Level #&#34;" />

diff --git a/templates/admin/view/game_levels.html b/templates/admin/view/game_levels.html
@@ -24,15 +24,15 @@ <h3>
                 <input id="game_level-uuid" name="uuid" type="hidden" />
                 <input id="game_level-last_level" name="last_level" type="hidden" />
                 <div class="control-group">
-                    <label class="control-label" for="game_level-name">{{ _("Level Name") }}</label>
+                    <label class="control-label" for="game_level-number">{{ _("Game Level") }}</label>
                     <div class="controls">
-                        <input id="game_level-name" name="name" placeholder="{{ _('Level Name') }}" maxlength=32 />
+                        <input required id="game_level-number" name="number" pattern="[0-9]+" placeholder="{{ _('Level Number') }}" type="number" min=0 />
                     </div>
                 </div>
                 <div class="control-group">
-                    <label class="control-label" for="game_level-number">{{ _("Game Level") }}</label>
+                    <label class="control-label" for="game_level-name">{{ _("Level Name") }}</label>
                     <div class="controls">
-                        <input required id="game_level-number" name="number" pattern="[0-9]+" placeholder="{{ _('Level Number') }}" type="number" min=0 />
+                        <input id="game_level-name" name="name" placeholder="{{ _('Level Name') }}" maxlength=32 type="text" />
                     </div>
                 </div>
                 <div class="control-group">