Changing GitUserInterface so it doesn't conflict with existing Users

dontdrinkandroot · Jul 11, 2015 · 968eeaf · 968eeaf
1 parent bdef603
commit 968eeaf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 deletions.
diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig
@@ -1,6 +1,6 @@
 {% extends "DdrGitkiBundle::scaffold.html.twig" %}
 
-{% block body %}
+{% block ddr_gitki_body %}
 
     <div class="container">
         <div class="row">
@@ -92,4 +92,4 @@
 
         </div>
     </div>
-{% endblock body %}
+{% endblock ddr_gitki_body %}
diff --git a/app/Resources/FOSUserBundle/views/layout.html.twig b/app/Resources/FOSUserBundle/views/layout.html.twig
@@ -1,5 +1,5 @@
 {% extends "DdrGitkiBundle::base.html.twig" %}
-{% block container %}
+{% block ddr_gitki_main_content %}
     {% for type, messages in app.session.flashBag.all %}
         {% for message in messages %}
             <div class="alert alert-info {{ type }}">
@@ -9,4 +9,4 @@
     {% endfor %}
     {% block fos_user_content %}
     {% endblock fos_user_content %}
-{% endblock container %}
+{% endblock ddr_gitki_main_content %}
diff --git a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig
@@ -1,6 +1,6 @@
 {% extends 'DdrGitkiBundle::scaffold.html.twig' %}
-{% block title %} - Login{% endblock %}
-{% block body %}
+{% block ddr_gitki_title %} - Login{% endblock ddr_gitki_title %}
+{% block ddr_gitki_body %}
     <div class="container">
 
         <div class="row">
@@ -94,4 +94,4 @@
         </div>
 
     </div>
-{% endblock %}
+{% endblock ddr_gitki_body %}
diff --git a/app/Resources/HWIOAuthBundle/views/layout.html.twig b/app/Resources/HWIOAuthBundle/views/layout.html.twig
@@ -1,5 +1,5 @@
 {% extends "DdrGitkiBundle::base.html.twig" %}
-{% block container %}
+{% block ddr_gitki_main_content %}
     {% block hwi_oauth_content %}
     {% endblock hwi_oauth_content %}
-{% endblock container %}
+{% endblock ddr_gitki_main_content %}
diff --git a/composer.lock b/composer.lock
diff --git a/src/Dontdrinkandroot/Gitki/WebBundle/Entity/User.php b/src/Dontdrinkandroot/Gitki/WebBundle/Entity/User.php
@@ -59,7 +59,21 @@ public function getGoogleId()
         return $this->googleId;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getGitUserName()
+    {
+        return $this->getUsername();
+    }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getGitUserEmail()
+    {
+        return $this->getEmail();
+    }
 
     public function __toString()
     {