Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| db084707bb | |||
| 1a9fff778a | |||
| 90a38edb29 | |||
| fc1b4a3e2a | |||
| 94a946e36d |
Executable → Regular
+32
-4
@@ -14,7 +14,7 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{{ form_start(formUser) }}
|
||||
{{ form_start(formUser, {'id': 'formUser'}) }}
|
||||
<div class="row">
|
||||
<div class="col-xs-8">
|
||||
<div class="box box-primary">
|
||||
@@ -31,13 +31,11 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6">
|
||||
<button class="btn btn-success" type="submit">Enregistrer</button>
|
||||
<button class="btn btn-success edit-email-user" data-toggle="tooltip" type="submit">Enregistrer</button>
|
||||
</div>
|
||||
</div>
|
||||
{{ form_end(formUser) }}
|
||||
|
||||
<br/>
|
||||
|
||||
{{ form_start(form) }}
|
||||
<div class="row">
|
||||
<div class="col-xs-8">
|
||||
@@ -88,3 +86,33 @@
|
||||
{{ form_end(form) }}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block javascripts %}
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$('[data-toggle="popover"]').popover();
|
||||
|
||||
$(".edit-email-user").confirm({
|
||||
title: "Êtes vous sûr de modifier l'adresse mail de cet utilisateur ?",
|
||||
content: "Si une erreur de saisie est présente, l'utilisateur ne pourra plus recevoir vos mails.",
|
||||
type: 'ored',
|
||||
boxWidth: '30%',
|
||||
useBootstrap: false,
|
||||
buttons: {
|
||||
confirm: {
|
||||
text: 'Confirmer',
|
||||
action: function() {
|
||||
$("[name='user_company']").submit();
|
||||
return true;
|
||||
}
|
||||
},
|
||||
cancel: {
|
||||
text: 'Annuler'
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
{% endblock %}
|
||||
@@ -106,7 +106,7 @@ fos_user:
|
||||
email:
|
||||
template: email/password_resetting.email.twig
|
||||
from_email:
|
||||
address: noreply@talentstube.com
|
||||
address: noreply@talentstube.io
|
||||
sender_name: talentstube.com
|
||||
service:
|
||||
mailer: fos_user.mailer.twig_swift
|
||||
|
||||
@@ -15,9 +15,9 @@ services:
|
||||
class: AppBundle\Utils\Services\AfterLoginRedirection
|
||||
arguments: ['@router']
|
||||
|
||||
#app.ad_searcher:
|
||||
# class: AppBundle\Utils\Services\AdSearcher
|
||||
# arguments: ['@fos_elastica.finder.ads.adfr']
|
||||
app.ad_searcher:
|
||||
class: AppBundle\Utils\Services\AdSearcher
|
||||
arguments: ['@fos_elastica.finder.ads.adfr']
|
||||
|
||||
app.ad_tags_searcher:
|
||||
class: AppBundle\Utils\Services\AdSearcher
|
||||
|
||||
@@ -309,8 +309,8 @@ class AdController extends Controller
|
||||
} else {
|
||||
$session->remove('contratSearch');
|
||||
}
|
||||
//$adSearcher = $this->get('app.ad_searcher');
|
||||
$ads = array();//$adSearcher->process($data);
|
||||
$adSearcher = $this->get('app.ad_searcher');
|
||||
$ads = $adSearcher->process($data);
|
||||
if(empty($ads)){
|
||||
$ads = $this->getPublishedAds($promoted);
|
||||
$noResults = true;
|
||||
|
||||
Reference in New Issue
Block a user