Merge pull request #20: Add new group ID display

Author: pawel-kow

docker-test/Dockerfile

@@ -5,6 +5,7 @@ ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8
 
 RUN apt-get update -y \
     && apt-get install -y --no-install-recommends apt-transport-https locales locales-all python3-pip python3-setuptools python3-dev curl libsasl2-dev libldap2-dev libssl-dev libxml2-dev libxslt1-dev libxmlsec1-dev libffi-dev build-essential libmariadb-dev-compat \
+    git \
     && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \

powerdnsadmin/routes/domainconnect.py

@@ -403,8 +403,7 @@ def template_edit_post(provider_id=None, service_id=None):
                 dc = DomainConnect(templ["providerId"], templ["serviceId"], template=templ)
                 dc_apply_result = dc.apply_template(zone_records=[], domain=request.form["domain"],
                                                     host=request.form["host"],
-                                                    group_ids=[s.strip() for s in request.form["group"].split(",")]
-                                                    if len(request.form["group"].strip()) > 0 else None,
+                                                    group_ids=request.form.getlist('group'),
                                                     params=request.form, ignore_signature=True, multi_aware=True)
                 result = transform_records_to_pdns_format(request.form["domain"], dc_apply_result[2])
             except Exception as e:
@@ -416,6 +415,8 @@ def template_edit_post(provider_id=None, service_id=None):
     return render_template('dc_template_edit.html', new=service_id is None or provider_id is None,
                            template_raw=request.form["_template"], template=templ,
                            params=variables,
+                           groups=DomainConnectTemplates.get_group_ids(templ),
+                           group_values=request.form.getlist('group'),
                            records=result, error=error, templateerror=templateerror)
 
 
@@ -427,7 +428,8 @@ def template_edit(provider_id, service_id):
     dc = DomainConnect(provider_id, service_id, template_path=Setting().get('dc_template_folder'))
     template = dc.data
     return render_template('dc_template_edit.html', new=False, template=template,
-                           params=DomainConnectTemplates.get_variable_names(template, {'domain': 'example.com'}))
+                           params=DomainConnectTemplates.get_variable_names(template, {'domain': 'example.com'}),
+                           groups=DomainConnectTemplates.get_group_ids(template))
 
 
 @dc_api_bp.route('/admin/templates/new', methods=['GET'])
@@ -519,7 +521,8 @@ def template_new():
         ]
     }
     return render_template('dc_template_edit.html', new=True, template=template,
-                           params=DomainConnectTemplates.get_variable_names(template, {'domain': 'example.com'}))
+                           params=DomainConnectTemplates.get_variable_names(template, {'domain': 'example.com'}),
+                           groups=DomainConnectTemplates.get_group_ids(template))
 
 
 @dc_api_bp.route('/admin/templates/providers/<string:provider_id>/services/<string:service_id>/save', methods=['POST'])

powerdnsadmin/templates/dc_template_edit.html

@@ -64,14 +64,26 @@ <h3 class="box-title">Variables</h3>
                     <input type="hidden" name="_test_template" id="variable_test_template" value="false"/>
                     <div class="box-body">
                         {% for k, v in params.items() %}
-                        <div class="row">
-                            <label class="col-xs-2" for="param_{{ k }}">
-                                {{ k }}
-                            </label>
-                            <div>
-                                <input type="text" id="param_{{ k }}" name="{{ k }}" class="input col-xs-9" value="{{ v }}"/>
+                            {% if k != "group" %}
+                            <div class="row">
+                                <label class="col-xs-2" for="param_{{ k }}">
+                                    {{ k }}
+                                </label>
+                                <div>
+                                    <input type="text" id="param_{{ k }}" name="{{ k }}" class="input col-xs-9" value="{{ v }}"/>
+                                </div>
                             </div>
-                        </div>
+                        {% else %}
+                            {% for g in groups %}
+                                <div class="row">
+                                    <label class="col-xs-2" for="group-{{ g }}">Group {{ g }}</label>
+                                    <div>
+                                        <input type="checkbox" class="input col-xs-1" id="group-{{ g }}" name="group" value="{{ g }}" {% if g in group_values %}checked{% endif %} >
+                                    </div>
+                                </div>
+                            {% endfor %}
+                            <hr>
+                        {% endif %}
                         {% endfor %}
                     </div>
                     <div class="box-body">

requirements.txt

@@ -32,5 +32,5 @@ Jinja2==3.0.3
 itsdangerous==2.0.1
 werkzeug==2.0.3
 cryptography==36.0.2
-git+https://github.com/Domain-Connect/DomainConnectApplyZone.git@v3.1.0-dev-templatelist_v4#egg=domainconnectzone
+git+https://github.com/Domain-Connect/DomainConnectApplyZone.git@v3.1.0-dev-templatelist_v5#egg=domainconnectzone
 Flask-WTF==1.0.1