github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix service handling in announcements page

pull/588/head
Kevin Petit 2020-05-16 18:36:31 +02:00
parent dab8c6ce83
commit 1e5dd646e6
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/Dashboard/DashboardMessages.vue
View File

@ -14,10 +14,10 @@
</thead> </thead>
<tbody> <tbody>
<tr v-for="(message, index) in $store.getters.messages" v-bind:key="index"> <tr v-for="message in $store.getters.messages" v-bind:key="message.id">
<td>{{message.title}}</td> <td>{{message.title}}</td>
<td class="d-none d-md-table-cell"> <td class="d-none d-md-table-cell">
<router-link :to="serviceLink(message.service)">{{service(message.service)}}</router-link> <router-link :to="serviceLink(service(message.service))">{{serviceName(service(message.service))}}</router-link>
</td> </td>
<td class="d-none d-md-table-cell">{{niceDate(message.start_on)}}</td> <td class="d-none d-md-table-cell">{{niceDate(message.start_on)}}</td>
<td class="text-right"> <td class="text-right">
@ -60,8 +60,10 @@
this.edit = !mode this.edit = !mode
}, },
service (id) { service (id) {
const s = this.$store.getters.serviceById(id) || {} return this.$store.getters.serviceById(id) || {}
return s.name || "Global Message" },
serviceName (service) {
return service.name || "Global Message"
}, },
async deleteMessage(m) { async deleteMessage(m) {
let c = confirm(`Are you sure you want to delete message '${m.title}'?`) let c = confirm(`Are you sure you want to delete message '${m.title}'?`)

8
frontend/src/forms/Message.vue
View File

@ -26,9 +26,9 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-4 col-form-label">Service</label> <label class="col-sm-4 col-form-label">Service</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select v-model="message.service_id" name="service_id" class="form-control"> <select v-model="message.service" name="service_id" class="form-control">
<option :value="0">Global Announcement</option> <option :value="0">Global Announcement</option>
<option v-for="(service, i) in $store.getters.services" :value="service.id" >{{service.name}}</option> <option v-for="service in $store.getters.services" :value="service.id" v-bind:key="service.id" >{{service.name}}</option>
</select> </select>
</div> </div>
</div> </div>
@ -46,9 +46,9 @@
<div v-show="this.service === null" class="form-group row"> <div v-show="this.service === null" class="form-group row">
<label for="service_id" class="col-sm-4 col-form-label">Service</label> <label for="service_id" class="col-sm-4 col-form-label">Service</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select v-model="message.service_id" class="form-control" name="service" id="service_id"> <select v-model="message.service" class="form-control" name="service" id="service_id">
<option :value="0">Global Message</option> <option :value="0">Global Message</option>
<option v-for="(service, index) in $store.getters.services" :value="service.id" v-bind:key="index" >{{service.name}}</option> <option v-for="service in $store.getters.services" :value="service.id" v-bind:key="service.id">{{service.name}}</option>
</select> </select>
</div> </div>
</div> </div>

5
frontend/src/mixin.js
View File

@ -79,12 +79,15 @@ export default Vue.mixin({
if (service.permalink) { if (service.permalink) {
service = this.$store.getters.serviceByPermalink(service.permalink) service = this.$store.getters.serviceByPermalink(service.permalink)
} }
if (service===undefined) { if (service===undefined || this.isEmptyObject(service)) {
return `/service/0` return `/service/0`
} }
let link = service.permalink ? service.permalink : service.id let link = service.permalink ? service.permalink : service.id
return `/service/${link}` return `/service/${link}`
}, },
isEmptyObject(obj) {
return Object.keys(obj).length === 0 && obj.constructor === Object
},
isInt(n) { isInt(n) {
return n % 1 === 0; return n % 1 === 0;
}, },