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.

Sign up for GitHub

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

Jump to bottom

gui: Count deleted items for remote out of sync items display (fixes #4668) #4669

Closed
wants to merge 2 commits into from
Closed

gui: Count deleted items for remote out of sync items display (fixes #4668) #4669

wants to merge 2 commits into from

Conversation

imsodin
Copy link
Member

@imsodin imsodin commented Jan 13, 2018

See #4668

In addition I noticed that the completion sent in the summary service do not include the "needDeletes" parameter. This is not directly needed to fix the linked issue, but I still fixed it.

@AudriusButkevicius
Copy link
Member

Are deletes actually included in the summary?

@imsodin
Copy link
Member Author

imsodin commented Jan 13, 2018

It's not part of the folder summary. This information is available at the db/completion endpoint and through folder completion events. In the GUI in both cases the data is simply assigned to $scope.completion[device][folder], so the data should be identical - which it wasn't before. Let me make that explicit by adding a separate function for that.

@calmh
Copy link
Member

calmh commented Jan 14, 2018

@st-review lgtm

@st-review
Copy link

@calmh: Noted! Need another LGTM or explicit merge command.

@AudriusButkevicius
Copy link
Member

@st-review lgtm

@st-review
Copy link

👌 Merged as f1c7399. Thanks, @imsodin!

@st-review st-review closed this Jan 14, 2018
st-review pushed a commit that referenced this pull request Jan 14, 2018
@imsodin @AudriusButkevicius
gui: Count deleted items for remote out of sync items display (fixes #…
f1c7399 
…4668)

GitHub-Pull-Request: #4669
LGTM: calmh, AudriusButkevicius
@imsodin imsodin deleted the devSyncList-if branch January 14, 2018 14:00
@st-review st-review added the pr-merged Legacy label used in the past for pull requests merged to the main tree label Jan 15, 2018
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Jan 15, 2019
@syncthing syncthing locked and limited conversation to collaborators Jan 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion pr-merged Legacy label used in the past for pull requests merged to the main tree
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@imsodin @AudriusButkevicius @calmh @st-review