Compare commits
No commits in common. "57606ce0d5cf4ea38f63825b7cf54f9e82a830b5" and "54158df23f5b7d4f771a6029921db23694f4c3da" have entirely different histories.
57606ce0d5
...
54158df23f
@ -194,7 +194,7 @@ class GroupController extends Controller
|
|||||||
$action .="<a href='".$this->generateUrl('cadoles_core_'.$access.'_group_users', array('id'=>$data->getId()))."'><i class='fa fa-users fa-2x fa-fw'></i></a>";
|
$action .="<a href='".$this->generateUrl('cadoles_core_'.$access.'_group_users', array('id'=>$data->getId()))."'><i class='fa fa-users fa-2x fa-fw'></i></a>";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$action.="<a href='".$this->generateUrl('cadoles_core_'.$access.'_group_out', array('id'=>$data->getId()))."'><i class='fa fa-sign-out-alt fa-fw fa-2x'></i></a>";
|
$action.="<a href='".$this->generateUrl('cadoles_core_'.$access.'_group_out', array('id'=>$data->getId()))."'><i class='fa fa-sign-out fa-fw fa-2x'></i></a>";
|
||||||
}
|
}
|
||||||
|
|
||||||
if($data->getFgcanshare())
|
if($data->getFgcanshare())
|
||||||
|
@ -143,11 +143,6 @@ class Registration implements UserInterface, \Serializable
|
|||||||
*/
|
*/
|
||||||
private $motivation;
|
private $motivation;
|
||||||
|
|
||||||
/**
|
|
||||||
* @ORM\Column(name="note", type="text", nullable=true)
|
|
||||||
*/
|
|
||||||
private $note;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="integer", length=60, nullable=true)
|
* @ORM\Column(type="integer", length=60, nullable=true)
|
||||||
*/
|
*/
|
||||||
@ -845,28 +840,4 @@ class Registration implements UserInterface, \Serializable
|
|||||||
{
|
{
|
||||||
return $this->passwordad;
|
return $this->passwordad;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Set note
|
|
||||||
*
|
|
||||||
* @param string $note
|
|
||||||
*
|
|
||||||
* @return Registration
|
|
||||||
*/
|
|
||||||
public function setNote($note)
|
|
||||||
{
|
|
||||||
$this->note = $note;
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get note
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getNote()
|
|
||||||
{
|
|
||||||
return $this->note;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -45,15 +45,6 @@ class RegistrationType extends AbstractType
|
|||||||
"attr" => array("class" => "btn btn-success")
|
"attr" => array("class" => "btn btn-success")
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$builder->add('note',
|
|
||||||
TextareaType::class, array(
|
|
||||||
"label" => "Notes Administrateur",
|
|
||||||
"required" => false,
|
|
||||||
"disabled" => ($options["mode"]=="delete"?true:false),
|
|
||||||
"attr" => array("class" => "form-control", "style" => "margin-bottom:15px; height: 130px")
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Obligatoire
|
# Obligatoire
|
||||||
|
@ -21,11 +21,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if mode!="submit" %}
|
{% if mode!="submit" %}
|
||||||
{% if mode=="send" %}
|
{% if mode=="send" %} {{ form_widget(form.save) }} {%endif%}
|
||||||
{{ form_widget(form.save) }}
|
|
||||||
<a class="btn btn-default" href="mailto:{{registration.email}}?subject= {{app.session.get('appname')}} : à propos de votre inscription">Envoyer un mail</a>
|
|
||||||
{%endif%}
|
|
||||||
|
|
||||||
<a class="btn btn-default" href={{ path('cadoles_core_config_registration') }}>Annuler</a>
|
<a class="btn btn-default" href={{ path('cadoles_core_config_registration') }}>Annuler</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
@ -60,19 +56,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{% if mode=="send" %}
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="panel panel-primary">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<i class="fa fa-key fa-fw"></i> Notes Administrateur
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{{ form_widget(form.note) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{%endif%}
|
|
||||||
|
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<div class="panel panel-primary">
|
<div class="panel panel-primary">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
@ -172,11 +172,9 @@
|
|||||||
{% if access=="config" and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %}
|
{% if access=="config" and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %}
|
||||||
<td><a style="cursor:pointer" title="Se Désinscrire"><i class="fa fa-sign-out fa-fw" onclick="removeLinkGroup({{ group.group.id }})"></i></a></td>
|
<td><a style="cursor:pointer" title="Se Désinscrire"><i class="fa fa-sign-out fa-fw" onclick="removeLinkGroup({{ group.group.id }})"></i></a></td>
|
||||||
{% elseif (group.group.fgopen or group.group.fgcanshare) and group.group.owner!=app.user and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %}
|
{% elseif (group.group.fgopen or group.group.fgcanshare) and group.group.owner!=app.user and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %}
|
||||||
<td><a style="cursor:pointer" title="Se Désinscrire"><i class="fa fa-sign-out-alt fa-fw" onclick="removeLinkGroup({{ group.group.id }})"></i></a></td>
|
<td><a style="cursor:pointer" title="Se Désinscrire"><i class="fa fa-sign-out fa-fw" onclick="removeLinkGroup({{ group.group.id }})"></i></a></td>
|
||||||
{% else %}
|
{% else %}
|
||||||
<td>
|
<td></td>
|
||||||
{{ group.group.id }}
|
|
||||||
</td>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user