Browse Source

Evolution #708: Mettre le password_set a true si récupération

Bastien Sevajol 12 years ago
parent
commit
f9ac364e18

+ 1 - 0
app/Resources/FOSUserBundle/views/Resetting/checkEmail.html.twig View File

1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
 
2
 
3
+{% block mainbox_classes %}mainbox_padding{% endblock %}
3
 {% block fos_user_content %}
4
 {% block fos_user_content %}
4
 <p>
5
 <p>
5
 {{ 'resetting.check_email'|trans({'%email%': ''}, 'FOSUserBundle') }}
6
 {{ 'resetting.check_email'|trans({'%email%': ''}, 'FOSUserBundle') }}

+ 1 - 0
app/Resources/FOSUserBundle/views/Resetting/passwordAlreadyRequested.html.twig View File

1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
 
2
 
3
+{% block mainbox_classes %}mainbox_padding{% endblock %}
3
 {% block fos_user_content %}
4
 {% block fos_user_content %}
4
 <p>{{ 'resetting.password_already_requested'|trans({}, 'FOSUserBundle') }}</p>
5
 <p>{{ 'resetting.password_already_requested'|trans({}, 'FOSUserBundle') }}</p>
5
 {% endblock fos_user_content %}
6
 {% endblock fos_user_content %}

+ 1 - 0
app/Resources/FOSUserBundle/views/Resetting/request.html.twig View File

1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
 
2
 
3
+{% block mainbox_classes %}mainbox_padding{% endblock %}
3
 {% block fos_user_content %}
4
 {% block fos_user_content %}
4
   {% include "FOSUserBundle:Resetting:request_content.html.twig" %}
5
   {% include "FOSUserBundle:Resetting:request_content.html.twig" %}
5
 {% endblock fos_user_content %}
6
 {% endblock fos_user_content %}

+ 1 - 0
app/Resources/FOSUserBundle/views/Resetting/reset.html.twig View File

1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
1
 {% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
 
2
 
3
+{% block mainbox_classes %}mainbox_padding{% endblock %}
3
 {% block fos_user_content %}
4
 {% block fos_user_content %}
4
 {% include "FOSUserBundle:Resetting:reset_content.html.twig" %}
5
 {% include "FOSUserBundle:Resetting:reset_content.html.twig" %}
5
 {% endblock fos_user_content %}
6
 {% endblock fos_user_content %}

+ 6 - 0
src/Muzich/CoreBundle/Entity/User.php View File

1166
     $this->password_set = ($set)?true:false;
1166
     $this->password_set = ($set)?true:false;
1167
   }
1167
   }
1168
   
1168
   
1169
+  public function setPlainPassword($password)
1170
+  {
1171
+    parent::setPlainPassword($password);
1172
+    $this->setPasswordSet(true);
1173
+  }
1174
+  
1169
 }
1175
 }

+ 0 - 0
src/Muzich/UserBundle/Resources/views/User/helpbox_favorite_tags.html.twig View File