Skip to content

Commit 81eed90

Browse files
fix: fix missing version issue during mssql installation
1 parent 46c1c34 commit 81eed90

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

agent/app/service/app.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -193,24 +193,7 @@ func (a AppService) GetApp(ctx *gin.Context, key string) (*response.AppDTO, erro
193193
if err != nil {
194194
return nil, err
195195
}
196-
var versionsRaw []string
197-
hasLatest := false
198-
latestVersion := ""
199-
for _, detail := range details {
200-
if strings.Contains(detail.Version, "latest") {
201-
hasLatest = true
202-
latestVersion = detail.Version
203-
continue
204-
}
205-
if key == "openresty" && !common.CompareAppVersion(detail.Version, "1.27") {
206-
continue
207-
}
208-
versionsRaw = append(versionsRaw, detail.Version)
209-
}
210-
appDTO.Versions = common.GetSortedVersions(versionsRaw)
211-
if hasLatest {
212-
appDTO.Versions = append([]string{latestVersion}, appDTO.Versions...)
213-
}
196+
appDTO.Versions = getAppVersions(key, details)
214197
tags, err := getAppTags(app.ID, strings.ToLower(common.GetLang(ctx)))
215198
if err != nil {
216199
return nil, err

agent/app/service/app_utils.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,3 +2174,28 @@ func isEditCompose(installed model.AppInstall) bool {
21742174
}
21752175
return false
21762176
}
2177+
2178+
func getAppVersions(key string, details []model.AppDetail) []string {
2179+
var (
2180+
versionsRaw []string
2181+
versions []string
2182+
)
2183+
hasLatest := false
2184+
latestVersion := ""
2185+
for _, detail := range details {
2186+
if key != "mssql" && strings.Contains(detail.Version, "latest") {
2187+
hasLatest = true
2188+
latestVersion = detail.Version
2189+
continue
2190+
}
2191+
if key == "openresty" && !common.CompareAppVersion(detail.Version, "1.27") {
2192+
continue
2193+
}
2194+
versionsRaw = append(versionsRaw, detail.Version)
2195+
}
2196+
versions = common.GetSortedVersions(versionsRaw)
2197+
if hasLatest {
2198+
versions = append([]string{latestVersion}, versions...)
2199+
}
2200+
return versions
2201+
}

frontend/src/views/login/components/login-form.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ const login = (formEl: FormInstance | undefined) => {
353353
} catch (res) {
354354
if (res.code === 401) {
355355
if (res.message === 'ErrCaptchaCode') {
356+
globalStore.ignoreCaptcha = false;
356357
loginForm.captcha = '';
357358
errCaptcha.value = true;
358359
errAuthInfo.value = false;

0 commit comments

Comments
 (0)