fixieren der useransicht wenn man nicht eingeloggt ist. fixieren der listenansicht wenn man nicht eingeloggt ist.

3 files changed, 8 insertions, 4 deletions

diff --git a/modules/user/user.go b/modules/user/user.go
index 2645919..da58382 100644
--- a/modules/user/user.go
+++ b/modules/user/user.go
@@ -52,7 +52,7 @@ func (m *Module) viewUser(w http.ResponseWriter, r *http.Request, p httprouter.P
         }
         
         user := currentUser
-        if currentUser.ID != userID {
+        if user == nil || currentUser.ID != userID {
                 user, err = m.g.Charakterin.GetUserByID(userID)
                 if err != nil {
                         http.Redirect(w, r, "/", 302)
diff --git a/views/list.html b/views/list.html
index b9ef7c8..81e8825 100644
--- a/views/list.html
+++ b/views/list.html
@@ -20,7 +20,11 @@
                                 <div class="col s12 {{ if ($user) and eq $user.ID $list.Owner.ID }}l8{{ end }}">
                                         <ul id="gril-list" class="gril-list">
                                         {{ range $index, $lg := $list.Grils }}
-                                                {{ template "list_gril" makeRangePair $index (makeObject "Gril" $lg "IsListOwner" (and ($user) (eq $user.ID $list.Owner.ID) )) }}
+                                                {{ if $user }}
+                                                        {{ template "list_gril" makeRangePair $index (makeObject "Gril" $lg "IsListOwner" (eq $user.ID $list.Owner.ID)) }}
+                                                {{ else }}
+                                                        {{ template "list_gril" makeRangePair $index (makeObject "Gril" $lg "IsListOwner" false) }}
+                                                {{ end }}
                                         {{ end }}
                                         </ul>
                                 </div>
diff --git a/views/list_gril.html b/views/list_gril.html
index 5cfd0df..37cf44c 100644
--- a/views/list_gril.html
+++ b/views/list_gril.html
@@ -5,12 +5,12 @@
                         <div class="col s3 m2">
                                 <div class="circle gril-img" style="background-image: url(/{{ .Value.Gril.Gril.ImagePath true }})"> </div>
                         </div>
-                        <div class="col s6 m6">
+                        <div class="col {{ if .Value.IsListOwner }}s6 m3{{ else }}s9 m10{{ end }}">
                         <span><a href="/gril/{{ .Value.Gril.Gril.Slug }}">{{ .Value.Gril.Gril.RomajiName }}</a><br />
                                 <span class="jap-name">{{ .Value.Gril.Gril.KanjiName }}</span>
                         </span>
                         </div>
-                        {{ if (.Value.IsListOwner) }}
+                        {{ if .Value.IsListOwner }}
                         <div class="col s3 m5">
                                 <div class="hide-on-med-and-up">
                                         <div class="row list-controls valign-wrapper">