Skip to content

Commit

Permalink
Merge branch 'release/4.17.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
blms committed Apr 25, 2024
2 parents 2c64fce + 24e5e78 commit cd223f8
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dbdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# Node is required to use dbdocs
- name: Setup node
uses: actions/setup-node@v2-beta
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Get Python version
run: echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sphinx_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Python version to use is stored in the .python-version file, which is the
# convention for pyenv: https://github.com/pyenv/pyenv
- name: Get Python version
run: echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- 8983:8983
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# use docker cp to copy the configset, then bash to set ownership to solr
- name: Copy Solr configset to solr service
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Get Python version
run: echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout commits up to and including HEAD^2
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2

Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- 8983:8983
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Decrypt encrypted fonts zip
run: |
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
run: echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.9.13
3.9.19
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Change Log
==========

4.17.2
------

- bugfix: Unable to rotate or reorder images in admin due to undefined rotation controls

4.17.1
------

Expand Down
2 changes: 1 addition & 1 deletion geniza/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version_info__ = (4, 17, 1, None)
__version_info__ = (4, 17, 2, None)


# Dot-connect all but the last. Last is dash-connected if not None.
Expand Down
6 changes: 3 additions & 3 deletions sitemedia/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@ function appendRotationControls() {
"div.field-admin_thumbnails div.admin-thumbnail"
) || [];
orderImages.forEach((div, i) => {
rotationControls = document.createElement("div");
const rotationControls = document.createElement("div");
rotationControls.classList.add("rotation-controls");
// rotate left button
rotateLeftButton = document.createElement("button");
const rotateLeftButton = document.createElement("button");
rotateLeftButton.classList.add("rotate-left");
rotateLeftButton.setAttribute("type", "button");
rotateLeftButton.setAttribute(
Expand All @@ -289,7 +289,7 @@ function appendRotationControls() {
rotateLeftButton.innerHTML = "↺";
rotationControls.appendChild(rotateLeftButton);
// rotate right button
rotateRightButton = document.createElement("button");
const rotateRightButton = document.createElement("button");
rotateRightButton.classList.add("rotate-right");
rotateRightButton.setAttribute("type", "button");
rotateRightButton.setAttribute(
Expand Down

0 comments on commit cd223f8

Please sign in to comment.