Skip to content

Commit

Permalink
set status values to match what is currently in oCIS frontend.go
Browse files Browse the repository at this point in the history
  • Loading branch information
phil-davis committed Feb 23, 2022
1 parent 2056f9d commit 07a2913
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions changelog/unreleased/change-status-values.md
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 match the values currently used for capabilities in oCIS.

https://github.com/cs3org/reva/pull/2581
6 changes: 3 additions & 3 deletions internal/http/services/owncloud/ocdav/status.go
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
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

0 comments on commit 07a2913

Please sign in to comment.