no more errors when repo doesn't have a group assigned

speedy901990 · May 19, 2013 · 97ab21a · 97ab21a
1 parent 6c3c7af
commit 97ab21a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
@@ -45,10 +45,18 @@ def edit
 
   def show
     @repository = Repository.find(params[:id])
-    @gtr = Grouptorepo.where("repository_id = ?", params[:id]).select("group_id").first
-    @x = Group.where("id = ?", @gtr.group_id).select("group_name").first
 
-    @usr = Usertogroup.where("group_id = ?", @gtr.group_id).all
+    if (@repository != nil)
+      @gtr = Grouptorepo.where("repository_id = ?", params[:id]).select("group_id").first
+    end
+
+    if (@gtr != nil)
+      @x = Group.where("id = ?", @gtr.group_id).select("group_name").first
+    end
+
+    if (@gtr != nil)
+      @usr = Usertogroup.where("group_id = ?", @gtr.group_id).all
+    end 
 
     @htr = Hook.all
     # @htr = Repohook.where("repository_id = ?", params[:id]).all

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
@@ -10,15 +10,19 @@
 </p>
 <p>
   <b>Group:</b><br/>
+  <% if (@x != nil) %>
   <%= @x.group_name %>
+  <% end %>
 </p>
 <p>
   <b>Members:</b><br/>
-	<% @usr.each do |f| %>
-       <% (User.where("id = ?", f.user_id).select("email").all).each do |z|%>
-       <%= z.email %>
-   	   <br/>
-   	   <% end %>
+  <% if @usr != nil %>
+	   <% @usr.each do |f| %>
+          <% (User.where("id = ?", f.user_id).select("email").all).each do |z|%>
+          <%= z.email %>
+   	      <br/>
+   	      <% end %>
+      <% end %>
    <% end %>
 </p>
 <p>