rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Fix error message when logging in" #948

Merged
jankstudio merged 1 commit from 109-fix-error-message-when-logging-in into master 2018-06-11 14:30:42 +00:00
Conversation 2 Commits 1 Files changed 2 +4 -2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
symfony.lock
View file

@ -116,6 +116,9 @@
"ref": "aaddfdf43cdecd4cf91f992052d76c2cadc04543" "ref": "aaddfdf43cdecd4cf91f992052d76c2cadc04543"
} }
}, },
"setasign/fpdf": {
"version": "1.8.1"
},
"symfony/cache": { "symfony/cache": {
"version": "v4.0.2" "version": "v4.0.2"
}, },

3
templates/login.html.twig
View file

@ -49,7 +49,7 @@
{% if error %} {% if error %}
<div class="m-alert m-alert--outline alert alert-danger alert-dismissible" role="alert"> <div class="m-alert m-alert--outline alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"></button> <button type="button" class="close" data-dismiss="alert" aria-label="Close"></button>
<span>{{ error }}</span> <span>{{ error.getMessage }}</span>
</div> </div>
{% endif %} {% endif %}
<div class="form-group m-form__group"> <div class="form-group m-form__group">
@ -177,7 +177,6 @@
<script src="/assets/demo/default/base/scripts.bundle.js" type="text/javascript"></script> <script src="/assets/demo/default/base/scripts.bundle.js" type="text/javascript"></script>
<!--end::Base Scripts --> <!--end::Base Scripts -->
<!--begin::Page Snippets --> <!--begin::Page Snippets -->
<script src="/assets/snippets/pages/user/login.js" type="text/javascript"></script>
<!--end::Page Snippets --> <!--end::Page Snippets -->
</body> </body>
<!-- end::Body --> <!-- end::Body -->