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

Merge branch 'connor' into connor-api-activity

parents a43b002c d4b186db

module/Oscar/src/Oscar/Entity/Role.php

+3 −0
Original line number Diff line number Diff line
@@ -409,6 +409,9 @@ class Role extends AbstractRole implements HierarchicalRoleInterface 
     */

    public function setLdapFilter(?string $ldapFilter): void

    {

        if (mb_strlen(trim($ldapFilter)) == 0) {

            $ldapFilter = NULL;

        }

        $this->ldapFilter = $ldapFilter;

    }

public/infos.php

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?php

/**

 * @author Stéphane Bouvry<stephane.bouvry@unicaen.fr>

 * @date: 18-01-22 17:05

 * @copyright Certic (c) 2018

 */

phpinfo();
 
 No newline at end of file

ui/src/views/administration/Discipline.vue

+14 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  </Modal>

  <nav>

    <input type="search" v-model="searched" class="form-control input-lg" placeholder="Rechercher une discipline" />

    <button class="btn btn-primary">

    <button class="btn btn-primary" @click="handlerCreateItem()">

      Nouvelle discipline

    </button>

  </nav>
@@ -74,6 +74,9 @@ let filtered = computed(()=> { 
});



// HANDLERS

function handlerCreateItem() {

  edited.value = JSON.parse('{"label":"","active":true,"usage":0}');

}

function handlerDeleteItem(item) {



}
@@ -88,9 +91,15 @@ function handlerEditItem(item) { 


function handlerSave() {

  let dt = JSON.parse(JSON.stringify(edited.value));

  if (dt.id) {

    AxiosOscar.put(props.url, dt).then((response) => {

      handlerFetch()

    })

  } else {

    AxiosOscar.post(props.url, dt).then((response) => {

      handlerFetch()

    })

  }

}



function handlerToggleUse(item) {