Mercurial > gemma
changeset 1293:bcfd038b97a2
stagingarea in new layout
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Thu, 22 Nov 2018 15:05:48 +0100 |
| parents | 5aeda02c51b9 |
| children | cf041cf30418 |
| files | client/src/components/map/contextbox/Staging.vue |
| diffstat | 1 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/map/contextbox/Staging.vue Thu Nov 22 13:37:29 2018 +0100 +++ b/client/src/components/map/contextbox/Staging.vue Thu Nov 22 15:05:48 2018 +0100 @@ -24,22 +24,20 @@ <td>{{ data.date }}</td> <td>{{ data.importID }}</td> <td> - <a + <button @click="toggleApproval(data.id, $options.STATES.APPROVED)" - v-if="isApproved(data) || needsApproval(data)" - class="text-success" + :class="{btn:true, 'btn-sm':true, 'btn-outline-success':needsApproval(data) || isRejected(data), 'btn-success':isApproved(data)}" > <i class="fa fa-check"></i> - </a> + </button> </td> <td> - <a + <button @click="toggleApproval(data.id, $options.STATES.REJECTED)" - v-if="isRejected(data) || needsApproval(data)" - class="text-danger" + :class="{btn:true, 'btn-sm':true, 'btn-outline-danger':needsApproval(data) || isApproved(data), 'btn-danger':isRejected(data)}" > <i class="fa fa-close"></i> - </a> + </button> </td> </tr> </tbody> @@ -177,12 +175,10 @@ const stagedResult = this.demodata.find(e => { return e.id === id; }); - if (this.needsApproval(stagedResult)) { - stagedResult.status = newStatus; + if (stagedResult.status === newStatus) { + stagedResult.status = this.$options.STATES.NEEDSAPPROVAL; } else { - stagedResult.status = this.isApproved(stagedResult) - ? this.$options.STATES.REJECTED - : this.$options.STATES.APPROVED; + stagedResult.status = newStatus; } } }