mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-07-03 15:36:14 +00:00
Pipeline corrections
This commit is contained in:
parent
404143f8a6
commit
606435a6b3
@ -17,7 +17,6 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
|
|||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ActivityReason controller.
|
* ActivityReason controller.
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<span class="chill-entity entity-user">
|
<span class="chill-entity entity-user">
|
||||||
{{ user.label }}
|
{{ user.label }}
|
||||||
<span class="user-job" v-if="user.user_job !== null"
|
<span class="user-job" v-if="user.user_job !== null">
|
||||||
> ({{ localizeString(user.user_job.label) }})</span
|
({{ localizeString(user.user_job.label) }})</span
|
||||||
>
|
>
|
||||||
<span class="main-scope" v-if="user.main_scope !== null"
|
<span class="main-scope" v-if="user.main_scope !== null">
|
||||||
> ({{ localizeString(user.main_scope.name) }})</span
|
({{ localizeString(user.main_scope.name) }})</span
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
v-if="user.isAbsent"
|
v-if="user.isAbsent"
|
||||||
|
@ -120,7 +120,7 @@ export default {
|
|||||||
|
|
||||||
return pos;
|
return pos;
|
||||||
},
|
},
|
||||||
handleScroll(event) {
|
handleScroll() {
|
||||||
let pos = this.findPos(this.stickyNav);
|
let pos = this.findPos(this.stickyNav);
|
||||||
let top = this.heightSum + this.top - window.scrollY;
|
let top = this.heightSum + this.top - window.scrollY;
|
||||||
//console.log(window.scrollY);
|
//console.log(window.scrollY);
|
||||||
|
@ -79,8 +79,9 @@
|
|||||||
{{ $t("select_time_spent") }}
|
{{ $t("select_time_spent") }}
|
||||||
</option>
|
</option>
|
||||||
<option
|
<option
|
||||||
v-for="time in timeSpentChoices"
|
v-for="(time, i) in timeSpentChoices"
|
||||||
:value="time.value"
|
:value="time.value"
|
||||||
|
:key="i"
|
||||||
>
|
>
|
||||||
{{ time.text }}
|
{{ time.text }}
|
||||||
</option>
|
</option>
|
||||||
|
@ -39,7 +39,7 @@ export default {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return makeFetch("PATCH", url, body)
|
return makeFetch("PATCH", url, body)
|
||||||
.then((response) => {
|
.then(() => {
|
||||||
this.$emit("referrerSet", ref);
|
this.$emit("referrerSet", ref);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
import { is_object_ready } from "../../../../../../ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers";
|
import { is_object_ready } from "../../../../../../ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers";
|
||||||
import {
|
import {
|
||||||
StoredObject,
|
StoredObject,
|
||||||
StoredObjectStatus,
|
|
||||||
StoredObjectStatusChange,
|
|
||||||
} from "../../../../../../ChillDocStoreBundle/Resources/public/types";
|
} from "../../../../../../ChillDocStoreBundle/Resources/public/types";
|
||||||
|
|
||||||
async function reload_if_needed(
|
async function reload_if_needed(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user