Commit 25675481 authored by matjaz's avatar matjaz

Merge branch 'dev' of workflow.ijs.si:mothra into dev

parents bf847041 a9b7197a
......@@ -19,6 +19,7 @@ atlassian-ide-plugin.xml
/mothra/public/static
/mothra/public/media
/mothra/public/files
/mothra/backup
# SQLite
/mothra/mothra.db
......@@ -50,13 +50,19 @@ class WebService:
method['name']=op['name']
method['inputs']=[]
method['outputs']=[]
input_dict = op['input'].values()[0]
try:
input_dict = op['input'].values()[0]
except:
input_dict = []
for i in input_dict:
input = {}
input['name']=i
input['type']=input_dict[i]
method['inputs'].append(input)
output_dict = op['output'].values()[0]
try:
output_dict = op['output'].values()[0]
except:
output_dict = [[]]
if type(output_dict)==type([]):
output_dict = output_dict[0]
for o in output_dict:
......
This diff is collapsed.
......@@ -3,27 +3,27 @@
<fieldset>
{% for p in parameters %}
{% if p.parameter_type == "checkbox" %}
<input id="pref-{{p.pk}}" name="pref-{{p.pk}}" type="checkbox" value="true" {% ifequal p.value 'true' %}checked {% endifequal%} style="width:15px;display:inline;float:left;" />
{% endif %}<label for="pref-{{p.pk}}" {% if p.parameter_type == "checkbox" %} style="float:left;"{% endif %}>{{p.name}}</label>
<input id="pref-{{p.pk}}" name="pref-{{p.pk}}" title="{{p.description}}" type="checkbox" value="true" {% ifequal p.value 'true' %}checked {% endifequal%} style="width:15px;display:inline;float:left;" />
{% endif %}<label for="pref-{{p.pk}}" title="{{p.description}}" {% if p.parameter_type == "checkbox" %} style="float:left;"{% endif %}>{{p.name}}</label>
{% if p.parameter_type == "checkbox" %}<div class="clear"><!----></div>{% endif %}
{% if p.parameter_type == "text" %}
<input id="pref-{{p.pk}}" name="pref-{{p.pk}}" type="text" value="{{p.value}}" onchange="" class="text ui-widget-content ui-corner-all" />
<input id="pref-{{p.pk}}" name="pref-{{p.pk}}" title="{{p.description}}" type="text" value="{{p.value}}" onchange="" class="text ui-widget-content ui-corner-all" />
{% endif %}
{% if p.parameter_type == "select" %}
<select id="pref-{{p.pk}}" name="pref-{{p.pk}}" style="background:#fefefe;width:99%;" class="text ui-widget-content ui-corner-all" onchange="">
<select id="pref-{{p.pk}}" name="pref-{{p.pk}}" title="{{p.description}}" style="background:#fefefe;width:99%;" class="text ui-widget-content ui-corner-all" onchange="">
{% for o in p.options.all %}
<option value="{{ o.value }}" {% if o.value == p.value %} selected {% endif %}>{{ o.name }}</option>
{% endfor %}
</select>
{% endif %}
{% if p.parameter_type == "textarea" %}
<textarea id="pref-{{p.pk}}" name="pref-{{p.pk}}" onchange="" class="text ui-widget-content ui-corner-all">{{ p.value }}</textarea>
<textarea id="pref-{{p.pk}}" name="pref-{{p.pk}}" title="{{p.description}}" onchange="" class="text ui-widget-content ui-corner-all">{{ p.value }}</textarea>
{% endif %}
{% if p.parameter_type == "file" %}
<form id="upload_form{{ p.pk }}" method="POST" action="{% url 'file upload' %}" enctype="multipart/form-data" target="upload_target{{ p.pk }}">
{% csrf_token %}
<input type="hidden" name="input_id" value="{{p.pk}}" />
<input id="id_file{{ p.pk }}" class="filename" type="file" name="file"><br/>
<input id="id_file{{ p.pk }}" title="{{p.description}}" class="filename" type="file" name="file"><br/>
<iframe id="upload_target{{ p.pk }}" name="upload_target{{ p.pk }}" src="" style="width:0px;height:0px;border:0px solid #fff;"></iframe>
</form>
......
......@@ -1221,7 +1221,8 @@ def export_package(request, packages):
all = (request.GET.get('all', 'False').lower()=='true' or request.GET.get('a', 'False').lower()=='true')
try:
verbosity = int(request.GET.get('v', '1'))
verbosity = int(request.GET.get('verbosity', '1'))
if verbosity == 1:
verbosity = int(request.GET.get('verbosity', '1'))
except:
verbosity = 1
packagesArray = tuple(packages.split('-'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment