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

Better log message in note and metadata controller, fix ColorSelectForm #1756

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Better log message in note and metadata controller, fix ColorSelectForm #1756

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
4 changes: 2 additions & 2 deletions openc3-cosmos-cmd-tlm-api/app/controllers/metadata_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def create
model = @model_class.from_json(hash.symbolize_keys, scope: params[:scope])
model.create
OpenC3::Logger.info(
"Metadata created: #{model}",
"Metadata created: #{hash}",
scope: params[:scope],
user: username()
)
Expand Down Expand Up @@ -156,7 +156,7 @@ def update
metadata: hash['metadata'],
)
OpenC3::Logger.info(
"Metadata updated: #{model}",
"Metadata updated: #{hash}",
scope: params[:scope],
user: username()
)
Expand Down
4 changes: 2 additions & 2 deletions openc3-cosmos-cmd-tlm-api/app/controllers/notes_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def create
model = @model_class.from_json(hash.symbolize_keys, scope: params[:scope])
model.create
OpenC3::Logger.info(
"Note created: #{model}",
"Note created: #{hash}",
scope: params[:scope],
user: username(),
)
Expand Down Expand Up @@ -161,7 +161,7 @@ def update
description: hash['description'],
)
OpenC3::Logger.info(
"Note updated: #{model}",
"Note updated: #{hash}",
scope: params[:scope],
user: username(),
)
Expand Down
15 changes: 5 additions & 10 deletions openc3-cosmos-init/plugins/packages/openc3-vue-common/src/tools/calendar/ColorSelectForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@

<template>
<div>
<v-select label="Color" :items="swatches" v-model="selectedColor">
<template v-slot:prepend-inner v-if="selectedColor">
<v-icon :color="selectedColor"> mdi-square </v-icon>
<v-select label="Color" :items="swatches" v-model="color">
<template v-slot:prepend-inner>
<v-icon :color="color"> mdi-square </v-icon>
</template>
<template v-slot:item="{ props, item }">
<v-list-item v-bind="props" :value="item">
<v-list-item v-bind="props" :value="item.raw">
<template v-slot:prepend>
<v-icon :color="item"> mdi-square </v-icon>
<v-icon :color="item.raw"> mdi-square </v-icon>
</template>
</v-list-item>
</template>
Expand All @@ -46,11 +46,6 @@ export default {
required: true,
},
},
data() {
return {
selectedColor: '',
}
},
computed: {
color: {
get() {
Expand Down
Loading