scout_ante/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TicketsBot/GoPanel

Browse Source
This commit is contained in:
rxdn 2023-04-13 17:48:16 +01:00
commit 2567c99007
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/http/endpoints/api/panel/panelcreate.go
View File

@ -506,7 +506,7 @@ func (p *panelBody) verifyNamingScheme() bool {
} }
// Validate placeholders used // Validate placeholders used
validPlaceholders := []string{"id", "username", "nickname"} validPlaceholders := []string{"id", "username", "nickname", "id_padded"}
for _, match := range placeholderPattern.FindAllStringSubmatch(*p.NamingScheme, -1) { for _, match := range placeholderPattern.FindAllStringSubmatch(*p.NamingScheme, -1) {
if len(match) < 2 { // Infallible if len(match) < 2 { // Infallible
return false return false

2
frontend/src/components/manage/SettingsCard.svelte
View File

@ -45,7 +45,7 @@
<span slot="header">Tickets</span> <span slot="header">Tickets</span>
<div slot="content" class="col-1"> <div slot="content" class="col-1">
<div class="row"> <div class="row">
<ChannelDropdown label="Archive Channel" col4 channels={channels} withNull={true} <ChannelDropdown label="Transcripts Channel" col4 channels={channels} withNull={true}
bind:value={data.archive_channel}/> bind:value={data.archive_channel}/>
<Dropdown label="Overflow Category" col4 bind:value={data.overflow_category_id}> <Dropdown label="Overflow Category" col4 bind:value={data.overflow_category_id}>
<option value=-1>Disabled</option> <option value=-1>Disabled</option>

4
frontend/src/includes/Sidebar.svelte
View File

@ -86,7 +86,7 @@
align-items: center; align-items: center;
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
padding: 5px 0 5px 0; padding: 5px 4%;
} }
.sidebar-element:hover { .sidebar-element:hover {
@ -107,7 +107,6 @@
align-items: center; align-items: center;
color: white !important; color: white !important;
font-size: 18px; font-size: 18px;
margin-left: 4%;
text-decoration: none; text-decoration: none;
} }
@ -172,7 +171,6 @@
:global(.sidebar-link) { :global(.sidebar-link) {
width: unset; width: unset;
margin-left: 0 !important;
} }
.user-element { .user-element {

2
utils/types/customembed.go
View File

@ -10,7 +10,7 @@ type CustomEmbed struct {
Title *string `json:"title" validate:"omitempty,min=1,max=255"` Title *string `json:"title" validate:"omitempty,min=1,max=255"`
Description *string `json:"description" validate:"omitempty,min=1,max=4096"` Description *string `json:"description" validate:"omitempty,min=1,max=4096"`
Url *string `json:"url" validate:"omitempty,url,max=255"` Url *string `json:"url" validate:"omitempty,url,max=255"`
Colour Colour `json:"colour" validate:"required,gte=0,lte=16777215"` Colour Colour `json:"colour" validate:"gte=0,lte=16777215"`
Author Author `json:"author" validate:"dive"` Author Author `json:"author" validate:"dive"`
ImageUrl *string `json:"image_url" validate:"omitempty,url,max=255"` ImageUrl *string `json:"image_url" validate:"omitempty,url,max=255"`
ThumbnailUrl *string `json:"thumbnail_url" validate:"omitempty,url,max=255"` ThumbnailUrl *string `json:"thumbnail_url" validate:"omitempty,url,max=255"`