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

activity: fix view all redirect #546

Merged
merged 1 commit into from
Sep 3, 2024
Merged

activity: fix view all redirect #546

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
6 changes: 5 additions & 1 deletion activity/timeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ func (c *TimelineCompo) MarshalHTML(ctx context.Context) ([]byte, error) {
URL(logModelBuilder.Info().ListingHref()).
Query("f_model_name", c.ModelName).
Query("f_model_keys", c.ModelKeys).
PushState(true).
Go(),
)
}).Else(func() h.HTMLComponent {
Expand Down Expand Up @@ -331,7 +332,10 @@ func (c *TimelineCompo) MarshalHTML(ctx context.Context) ([]byte, error) {
vars.%s = toplocals.deletingLogID
})
}`, presets.VarsPresetsDataChanged, varEditing, varCurrentActive)).
Attr("v-on-unmounted", fmt.Sprintf(`() => { delete(vars.%s.%s) }`, presets.VarsPresetsDataChanged, varEditing)).
Attr("v-on-unmounted", fmt.Sprintf(`() => {
delete(vars.%s.%s)
delete(vars.%s)
}`, presets.VarsPresetsDataChanged, varEditing, varCurrentActive)).
Children(
children...,
),
Expand Down
17 changes: 9 additions & 8 deletions presets/presets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,9 @@
varCurrentActive, idCurrentActive,
varToWatch,
varCurrentActive,
)), nil
)).Attr("v-on-unmounted", fmt.Sprintf(`() => {
vars.%s = '';
}`, varCurrentActive)), nil

Check warning on line 882 in presets/presets.go

View check run for this annotation

Codecov / codecov/patch

presets/presets.go#L880-L882 

Added lines #L880 - L882 were not covered by tests
}

func (b *Builder) rightDrawer(ctx *web.EventContext, r *web.EventResponse, comp h.HTMLComponent, width string) {
Expand Down Expand Up @@ -1495,14 +1497,13 @@
i18n.LanguageTagFromContext(ctx.R.Context(), language.English).String(),
"-", "",
)
r.Body =
h.Div(
r.Body = h.Div(
VProgressLinear().
Attr(":active", "vars.globalProgressBar.show").
Attr(":model-value", "vars.globalProgressBar.value").
Attr("style", "position: fixed; z-index: 2000;").
Height(2).
Color(b.progressBarColor),
Attr(":active", "vars.globalProgressBar.show").
Attr(":model-value", "vars.globalProgressBar.value").
Attr("style", "position: fixed; z-index: 2000;").
Height(2).
Color(b.progressBarColor),
VLocaleProvider().Locale(currentVuetifyLocale).FallbackLocale("en").Children(r.Body),
)
}
Expand Down
Loading