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

set status values to match what is currently in oCIS frontend.go #2581

Merged
merged 1 commit into from
Feb 24, 2022
Merged

set status values to match what is currently in oCIS frontend.go #2581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions changelog/unreleased/change-status-values.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Change: Update hard-coded status values

The hard-coded version and product values have been updated to be consistent in all places in the code.

https://github.com/cs3org/reva/pull/2581
6 changes: 3 additions & 3 deletions internal/http/services/owncloud/ocdav/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ func (s *svc) doStatus(w http.ResponseWriter, r *http.Request) {
Installed: true,
Maintenance: false,
NeedsDBUpgrade: false,
Version: "10.0.9.5", // TODO(jfd) make build/config determined
VersionString: "10.0.9",
Version: "10.0.11.5", // TODO(jfd) make build/config determined
VersionString: "10.0.11",
Edition: "community",
ProductName: "ownCloud",
ProductName: "reva",
}

statusJSON, err := json.MarshalIndent(status, "", " ")
Expand Down
8 changes: 4 additions & 4 deletions internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ func (h *Handler) Init(c *config.Config) {
// h.c.Capabilities.Core.Status.Maintenance is boolean
// h.c.Capabilities.Core.Status.NeedsDBUpgrade is boolean
if h.c.Capabilities.Core.Status.Version == "" {
h.c.Capabilities.Core.Status.Version = "10.0.9.5" // TODO make build determined
h.c.Capabilities.Core.Status.Version = "10.0.11.5" // TODO make build determined
}
if h.c.Capabilities.Core.Status.VersionString == "" {
h.c.Capabilities.Core.Status.VersionString = "10.0.9" // TODO make build determined
h.c.Capabilities.Core.Status.VersionString = "10.0.11" // TODO make build determined
}
if h.c.Capabilities.Core.Status.Edition == "" {
h.c.Capabilities.Core.Status.Edition = "community" // TODO make build determined
Expand Down Expand Up @@ -213,8 +213,8 @@ func (h *Handler) Init(c *config.Config) {
// TODO get from build env
Major: 10,
Minor: 0,
Micro: 9,
String: "10.0.9",
Micro: 11,
String: "10.0.11",
Edition: "community",
}
}
Expand Down