SHIMADA Koji
null+****@clear*****
Wed Sep 26 13:40:26 JST 2012
SHIMADA Koji 2012-09-26 13:40:26 +0900 (Wed, 26 Sep 2012) New Revision: aa3e53b25e5d6c34149e1a04a1d8d1d7cf37c18f https://github.com/logaling/logaling-server/commit/aa3e53b25e5d6c34149e1a04a1d8d1d7cf37c18f Merged f2e4ecc: Merge pull request #16 from logaling/add-github-project-glossaries-to-priority-glossary Log: List github projects on dashboard Modified files: app/controllers/dashboard_controller.rb app/views/dashboard/show.html.haml Modified: app/controllers/dashboard_controller.rb (+1 -0) =================================================================== --- app/controllers/dashboard_controller.rb 2012-09-26 08:45:34 +0900 (647848a) +++ app/controllers/dashboard_controller.rb 2012-09-26 13:40:26 +0900 (febd867) @@ -4,5 +4,6 @@ class DashboardController < ApplicationController def show @user_config = current_user.user_config || UserConfig.new @user_glossaries = current_user.user_glossaries + @github_projects = current_user.github_projects end end Modified: app/views/dashboard/show.html.haml (+5 -0) =================================================================== --- app/views/dashboard/show.html.haml 2012-09-26 08:45:34 +0900 (9366392) +++ app/views/dashboard/show.html.haml 2012-09-26 13:40:26 +0900 (7cd511f) @@ -18,3 +18,8 @@ .well %p= link_to 'Add new github project membership', new_user_github_project_membership_path(:user_id => current_user), :class => 'btn btn-large btn-primary' + %p + %ul + - @github_projects.each do |github_project| + %li + = github_project.full_name -------------- next part -------------- An HTML attachment was scrubbed... Download