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

gui: Fix detailed staggered versioning information in folder info (ref #8348) #8433

Merged
merged 1 commit into from Jul 26, 2022

Conversation

tomasz1986
Copy link
Contributor

Currently, there are two issues with the detailed staggered versioning
information displayed in the folder info. Firstly, the maxAge value of
365d is displayed despite matching the default. Secondly, there is no
consideration for the special case of maxAge equal to 0, meaning that
versions are kept forever.

This commit fixes both of those issues, so that the default maxAge is
not displayed and its value of 0 is displayed as "forever".

Signed-off-by: Tomasz Wilczyński twilczynski@naver.com

Screenshots

Before

maxAge set to 365d

image

maxAge set to 0

image

After

maxAge set to 365d

image

maxAge set to 0

image

…syncthing#8348)

Currently, there are two issues with the detailed staggered versioning
information displayed in the folder info. Firstly, the maxAge value of
365d is displayed despite matching the default. Secondly, there is no
consideration for the special case of maxAge equal to 0, meaning that
versions are kept forever.

This commit fixes both of those issues, so that the default maxAge is
not displayed and its value of 0 is displayed as "forever".

Signed-off-by: Tomasz Wilczyński <twilczynski@naver.com>
@uok
Copy link
Contributor

uok commented Jul 13, 2022

alternatively you could use trash can symbol and "no" as text

@tomasz1986
Copy link
Contributor Author

I personally don't like using a trash can icon here, as there is "Trash Can" versioning already, and using such an icon with other types of versioning could be confusing. That's also why I chose the calendar icon instead in the first place.

The wording "forever" comes from the description in the versioning settings.

image

@calmh calmh merged commit 9f4d23c into syncthing:main Jul 26, 2022
calmh added a commit to calmh/syncthing that referenced this pull request Jul 28, 2022
* main:
  cmd/syncthing, lib/config: Remove restartOnWakeup option & functionality (fixes syncthing#8448) (syncthing#8449)
  gui: Remove blank meta tags (syncthing#8362)
  gui: Add device sync status (fixes syncthing#7981) (syncthing#8401)
  gui: Fix detailed staggered versioning information in folder info (ref syncthing#8348) (syncthing#8433)
  all: Support syncing ownership (fixes syncthing#1329) (syncthing#8434)
  gui, man, authors: Update docs, translations, and contributors
  lib/model, lib/config: Apply sensible defaults for auto-accepted encrypted folder (fixes syncthing#8296) (syncthing#8427)
  gui: Move filesystem watcher explanation from tooltip to help block (syncthing#8432)
  gui: Use discovered IDs from cache when adding a new remote device (syncthing#8382)
  build: Update goleveldb (syncthing#8440)
  gui, man, authors: Update docs, translations, and contributors
  cmd/syncthing/cli: Add show discovery command (fixes syncthing#8007) (syncthing#8378)
  gui, man, authors: Update docs, translations, and contributors
  lib/osutil: Only announce address of interfaces which are up (fixes syncthing#7458) (syncthing#8422)
  gui: Fix missing span end tag and missing nbsp semicolon in HTML (syncthing#8419)
calmh added a commit to calmh/syncthing that referenced this pull request Jul 28, 2022
* main:
  all: Fix unused method receiver (further) (syncthing#8466)
  all: Minor deprecation updates
  lib/model: Clarify normal shallow copy
  lib/api: Missing error handling in config handler (syncthing#8463)
  all: Remove unused method receivers (syncthing#8462)
  all: Combine sequential appends (syncthing#8461)
  cmd/ursrv: Silence linter with correct regexps (syncthing#8460)
  all: Unused parameter should be replaced by underscore (syncthing#8464)
  all: Remove or convert deprecated API usages (syncthing#8459)
  lib/config: Remove unnecessary use of `fmt.Sprintf` (syncthing#8458)
  lib/model: Replace `for` loop with `append` (syncthing#8457)
  all: Fix check for empty string (syncthing#8456)
  cmd/syncthing, lib/config: Remove restartOnWakeup option & functionality (fixes syncthing#8448) (syncthing#8449)
  gui: Remove blank meta tags (syncthing#8362)
  gui: Add device sync status (fixes syncthing#7981) (syncthing#8401)
  gui: Fix detailed staggered versioning information in folder info (ref syncthing#8348) (syncthing#8433)
@calmh calmh added this to the v1.21.0 milestone Aug 9, 2022
@tomasz1986 tomasz1986 deleted the tomasz86/gui/fixstaggereddisplay branch August 13, 2022 13:12
@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 Jul 26, 2023
@syncthing syncthing locked and limited conversation to collaborators Jul 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants