add dashboard teams block

3c6e1446 · Andrey Kumanyaev · Dmitriy Zaporozhets · a96cf3ad · 3c6e1446 · 3c6e1446
Commit 3c6e1446 authored Jan 19, 2013 by Andrey Kumanyaev Committed by Dmitriy Zaporozhets Jan 24, 2013
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

app/controllers/dashboard_controller.rb app/controllers/dashboard_controller.rb +2 -0

app/views/dashboard/_sidebar.html.haml app/views/dashboard/_sidebar.html.haml +2 -0

No files found.
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -18,6 +18,8 @@ class DashboardController < ApplicationController
                  @projects
                end

+    @teams = (UserTeam.with_member(current_user) + UserTeam.created_by(current_user)).uniq
+
    @projects = @projects.page(params[:page]).per(30)

    @events = Event.in_projects(current_user.authorized_projects.pluck(:id))

--- a/app/views/dashboard/_sidebar.html.haml
+++ b/app/views/dashboard/_sidebar.html.haml
+- if @teams.present?
+  = render "teams", teams: @teams
 - if @groups.present?
  = render "groups", groups: @groups
 = render "projects", projects: @projects