Commit dd58f8ec authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- Ajout de l'option "Supprimer" sur la fiche activité 

 - Le debug "Query" n'est plus affiché sur la recherche avancée
parent 11ef3191

module/Oscar/src/Oscar/Service/ProjectGrantApiService.php

+3 −0
Changes for module/Oscar/src/Oscar/Service/ProjectGrantApiService.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ class ProjectGrantApiService implements 
        $credentials = [

            'currentPersonId' => $oscarUserContext->getCurrentPersonId() ?: -1,

            'read' => $oscarUserContext->hasPrivileges(Privileges::ACTIVITY_SHOW, $activity),

            'delete' => $oscarUserContext->hasPrivileges(Privileges::ACTIVITY_DELETE, $activity),

            'edit' => $editable,

            'lock' => $locked,

            'lock_edit' => $lockEditable,
@@ -267,6 +268,7 @@ class ProjectGrantApiService implements 
                                Privileges::ACTIVITY_EDIT,

                                $activity

                            ),

                        'delete' => $oscarUserContext->hasPrivileges(Privileges::ACTIVITY_DELETE, $activity),

                        'duplicate' => $oscarUserContext->hasPrivileges(

                            Privileges::ACTIVITY_CREATE

                        ),
@@ -583,6 +585,7 @@ class ProjectGrantApiService implements 
            'urls' => [

                'duplicate' => $urlPlugin->fromRoute('contract/duplicate', ['id' => $activity->getId()]),

                'edit' => $urlPlugin->fromRoute('contract/edit', ['id' => $activity->getId()]),

                'delete' => $urlPlugin->fromRoute('contract/delete', ['id' => $activity->getId()]),

                'change_project' => $urlPlugin->fromRoute('contract/moveToProject', ['id' => $activity->getId()]),

                'new_project' => $urlPlugin->fromRoute('project/new') . '?ids=' . $activity->getId(),

                'pcru' => $urlPlugin->fromRoute('contract/pcru-informations', ['id' => $activity->getId()])

ui/src/views/Activity.vue

+4 −0
Changes for ui/src/views/Activity.vue: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -332,6 +332,10 @@ 
              <i class="icon-pencil"></i>

              Modifier les informations</a>



            <a class="btn btn-danger" v-if="credentials.core.delete" :href="core.urls.delete">

              <i class="icon-trash"></i>

              Supprimer l'activité</a>



            <a class="btn btn-default" v-if="credentials.core.change_project" :href="core.urls.change_project">

              <i class="icon-cubes"></i>

              Modifier le projet</a>

ui/src/views/ActivityList.vue

+0 −1
Changes for ui/src/views/ActivityList.vue: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ 
          @addfilter="handlerAddFilterFromRaw($event, true)"

      />

    </section>

    <pre>QUERY: {{ query }}</pre>

  </div>

</template>

<script>