Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjustments for FW 3.12 #19

Merged
merged 4 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
else pip install https://github.com/fiduswriter/fiduswriter/archive/main.zip;
fi
cd fiduswriter
mv ../ci/configuration.py ./
mv ../ci/.coveragerc ./
cp ../ci/configuration.py ./
cp ../ci/.coveragerc ./
pip install requests[security]
pip install coverage
pip install coveralls
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ static-libs/
fiduswriter/static-transpile
fiduswriter/static-collected
fiduswriter/.coveragerc
fiduswriter/.coverage
fiduswriter/configuration.py
fiduswriter/fiduswriter.sql
fiduswriter/fiduswriter.sqlite3
Expand Down
2 changes: 1 addition & 1 deletion fiduswriter/book/static/js/modules/books/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export class BookOverview {
}
case findTarget(event, "a.fw-data-table-title.parentdir", el):
event.preventDefault()
if (this.table.data.length > 1) {
if (this.table.data.data.length > 1) {
this.path = el.target.dataset.path
window.history.pushState(
{},
Expand Down
2 changes: 1 addition & 1 deletion fiduswriter/book/tests/test_book.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def test_books(self):
# Login as user 1 again.
self.login_user(self.user, self.driver, self.client)
self.driver.refresh()
time.sleep(2)
time.sleep(self.wait_time / 2)
# Add access rights for user 2 (write) + 3 (read)
self.driver.find_element(
By.CSS_SELECTOR,
Expand Down
Loading