null+****@clear*****
null+****@clear*****
Tue Jul 3 17:23:02 JST 2012
SUZUKI Miho 2012-07-03 17:23:02 +0900 (Tue, 03 Jul 2012) New Revision: d11b08ff4b1f3ecfa9de445939e673dd4527e592 https://github.com/logaling/logaling-server/commit/d11b08ff4b1f3ecfa9de445939e673dd4527e592 Merged ba9eeff: Merge pull request #5 from logaling/show-terms-of-glossary Log: Show glossaries containd in a project Modified files: Gemfile Gemfile.lock app/models/github_project.rb app/views/github_projects/show.html.haml Modified: Gemfile (+1 -1) =================================================================== --- Gemfile 2012-07-03 15:06:26 +0900 (12a1c11) +++ Gemfile 2012-07-03 17:23:02 +0900 (a8928ac) @@ -39,7 +39,7 @@ gem 'haml-rails' # To use debugger # gem 'ruby-debug19', :require => 'ruby-debug' -gem 'logaling-command', :git => 'git://github.com/logaling/logaling-command.git', :require => 'logaling' +gem 'logaling-command', :git => 'git://github.com/logaling/logaling-command.git', :require => 'logaling', :ref => 'b6be24a2072aa5344a659596920715833d85bc08' #TODO: use latest logaling-command group :development, :test do gem 'rspec-rails' Modified: Gemfile.lock (+2 -1) =================================================================== --- Gemfile.lock 2012-07-03 15:06:26 +0900 (ca5004f) +++ Gemfile.lock 2012-07-03 17:23:02 +0900 (5ea217f) @@ -1,6 +1,7 @@ GIT remote: git://github.com/logaling/logaling-command.git - revision: 627c99be6c500e8a87f9e9aa2fa33c8e55b4dfac + revision: b6be24a2072aa5344a659596920715833d85bc08 + ref: b6be24a2072aa5344a659596920715833d85bc08 specs: logaling-command (0.1.6) activesupport Modified: app/models/github_project.rb (+9 -0) =================================================================== --- app/models/github_project.rb 2012-07-03 15:06:26 +0900 (e0f2bad) +++ app/models/github_project.rb 2012-07-03 17:23:02 +0900 (9bbfcdb) @@ -32,4 +32,13 @@ class GithubProject < ActiveRecord::Base def logaling_name "github-%s-%s" % [owner, name] end + + def glossaries + registered_project.glossaries + end + + private + def registered_project + LogalingServer.repository.find_project(logaling_name) + end end Modified: app/views/github_projects/show.html.haml (+3 -0) =================================================================== --- app/views/github_projects/show.html.haml 2012-07-03 15:06:26 +0900 (8720649) +++ app/views/github_projects/show.html.haml 2012-07-03 17:23:02 +0900 (d09cebb) @@ -3,3 +3,6 @@ .well %h2= @github_project.full_name %p= @github_project.remote_repository_url + %p + - @github_project.glossaries.each do |glossary| + = [glossary.source_language, glossary.target_language].join('-') -------------- next part -------------- An HTML attachment was scrubbed...Descargar
