krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Staging fixes (#9819)

Browse Source 
* categories can be selected

* quick inventory fixes
This commit is contained in:
Matteo Pagliazzi
2018-01-18 11:30:39 +01:00
committed by GitHub
parent 9762258975
commit 2159df785f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/groups/groupFormModal.vue
View File

@@ -77,8 +77,8 @@
v-if='group.key !== "habitica_official" || user.contributor.admin' v-if='group.key !== "habitica_official" || user.contributor.admin'
) )
.custom-control.custom-checkbox .custom-control.custom-checkbox
input.custom-control-input(:id="group.key", type="checkbox", :value="group.key", v-model="workingGroup.categories") input.custom-control-input(:id="`category-${group.key}`", type="checkbox", :value="group.key", v-model="workingGroup.categories")
label.custom-control-label(v-once, :for="group.key") {{ $t(group.label) }} label.custom-control-label(v-once, :for="`category-${group.key}`") {{ $t(group.label) }}
button.btn.btn-primary(@click.prevent="toggleCategorySelect") {{$t('close')}} button.btn.btn-primary(@click.prevent="toggleCategorySelect") {{$t('close')}}
// @TODO: need categories only for PUBLIC GUILDS, not for tavern, private guilds, or party // @TODO: need categories only for PUBLIC GUILDS, not for tavern, private guilds, or party

6
website/client/components/ui/drawerSlider.vue
View File

@@ -4,13 +4,13 @@
) )
div.slider-button-area.left-button( div.slider-button-area.left-button(
v-if="scrollButtonsVisible", v-if="scrollButtonsVisible",
@mousedown.left="shiftLeft" @mousedown.left="shiftRight"
) )
a.slider-button a.slider-button
.svg-icon(v-html="icons.previous") .svg-icon(v-html="icons.previous")
div.slider-button-area.right-button( div.slider-button-area.right-button(
v-if="scrollButtonsVisible", v-if="scrollButtonsVisible",
@mousedown.left="shiftRight" @mousedown.left="shiftLeft"
) )
a.slider-button a.slider-button
.svg-icon(v-html="icons.next") .svg-icon(v-html="icons.next")
@@ -127,7 +127,7 @@
let itemsPerPage = this.itemsPerPage(); let itemsPerPage = this.itemsPerPage();
let firstSlice = items.slice(pointer, pointer + itemsPerPage); let firstSlice = items.slice(pointer, pointer + itemsPerPage);
if (firstSlice.length === itemsPerPage) { if (firstSlice.length === itemsPerPage || items.length < itemsPerPage ) {
return firstSlice; return firstSlice;
} else { } else {
let getRemainderItems = itemsPerPage - firstSlice.length; let getRemainderItems = itemsPerPage - firstSlice.length;