ci: merge main to release

README.md

@@ -140,10 +140,10 @@ This will create packages under `ietf/static/dist-neue`, which are then served b
 
 #### Parcel *(Legacy/jQuery)*
 
-The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css`, respectively.
+The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css` respectively, bundled using Parcel.
 Static images are likewise in `ietf/static/images`.
 
-Whenever changes are made to the files under `ietf/static`, you must re-run `parcel` to package them:
+Whenever changes are made to the files under `ietf/static`, you must re-run the build command to package them:
 
 ``` shell
 yarn legacy:build

dev/coverage-action/package.json

@@ -14,11 +14,11 @@
     "luxon": "3.3.0"
   },
   "devDependencies": {
-    "eslint": "8.42.0",
+    "eslint": "8.43.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.1.1",
-    "npm-check-updates": "16.10.12"
+    "npm-check-updates": "16.10.13"
   }
 }

dev/diff/package.json

@@ -7,7 +7,7 @@
     "enquirer": "^2.3.6",
     "extract-zip": "^2.0.1",
     "fs-extra": "^11.1.1",
-    "got": "^12.6.1",
+    "got": "^13.0.0",
     "keypress": "^0.2.1",
     "listr2": "^6.6.0",
     "lodash-es": "^4.17.21",

ietf/nomcom/views.py

@@ -1106,6 +1106,41 @@ def edit_template(request, year, template_id):
 def list_positions(request, year):
     nomcom = get_nomcom_by_year(year)
     positions = nomcom.position_set.order_by('-is_open')
+    if request.method == 'POST':
+        if nomcom.group.state_id != 'active':
+            messages.warning(request, "This nomcom is not active. Request administrative assistance if Position state needs to change.")
+        else:
+            action = request.POST.get('action')
+            positions_to_modify = request.POST.getlist('selected')
+            if positions_to_modify:
+                positions = positions.filter(id__in=positions_to_modify)
+                if action == "set_iesg":
+                    positions.update(is_iesg_position=True)
+                    messages.success(request,'The selected positions have been set as IESG Positions')
+                elif action == "unset_iesg":
+                    positions.update(is_iesg_position=False)
+                    messages.success(request,'The selected positions have been set as NOT IESG Positions')
+                elif action == "set_open":
+                    positions.update(is_open=True)
+                    messages.success(request,'The selected positions have been set as Open')
+                elif action == "unset_open":
+                    positions.update(is_open=False)
+                    messages.success(request,'The selected positions have been set as NOT Open')
+                elif action == "set_accept_nom":
+                    positions.update(accepting_nominations=True)
+                    messages.success(request,'The selected positions have been set as Accepting Nominations')
+                elif action == "unset_accept_nom":
+                    positions.update(accepting_nominations=False)
+                    messages.success(request,'The selected positions have been set as NOT Accepting Nominations')
+                elif action == "set_accept_fb":
+                    positions.update(accepting_feedback=True)
+                    messages.success(request,'The selected positions have been set as Accepting Feedback')
+                elif action == "unset_accept_fb":
+                    positions.update(accepting_feedback=False)
+                    messages.success(request,'The selected positions have been set as NOT Accepting Feedback')
+                positions = nomcom.position_set.order_by('-is_open')
+            else:
+                messages.warning(request, "Please select some positions to work with")
 
     return render(request, 'nomcom/list_positions.html',
                               {'positions': positions,

ietf/secr/sreq/tests.py

@@ -146,7 +146,7 @@ def test_edit(self):
         self.assertRedirects(r, redirect_url)
 
         # Check whether updates were stored in the database
-        sessions = Session.objects.filter(meeting=meeting, group=mars)
+        sessions = Session.objects.filter(meeting=meeting, group=mars).order_by("id")  # order to match edit() view
         self.assertEqual(len(sessions), 2)
         session = sessions[0]
 

ietf/secr/sreq/views.py

@@ -730,6 +730,7 @@ def no_session(request, acronym):
         requested_duration=datetime.timedelta(0),
         type_id='regular',
         purpose_id='regular',
+        has_onsite_tool=group.features.acts_like_wg,
     )
     SchedulingEvent.objects.create(
         session=session,

ietf/templates/nomcom/edit_position.html

@@ -31,5 +31,14 @@ <h2>
                {% if position %}Save{% else %}Add{% endif %}</button>
         <a class="btn btn-secondary float-end" href="../">Back</a>
     </form>
+    {% if position.name %}
+        <h3>
+            Templates
+        </h3>
+        {% for template in position.get_templates %}
+            <a href="{% url 'ietf.nomcom.views.edit_template' year template.id %}">{{ template }}</a>
+            <br>
+        {% endfor %}
+    {% endif %}
 {% endblock %}
-{% block content_end %}{{ form.media.js }}{% endblock %}
+{% block content_end %}{{ form.media.js }}{% endblock %}