From 01df245825172d7af92ed183274f8f6d7918aa8d Mon Sep 17 00:00:00 2001
From: Alessandro Palmeira <alessandro.palmeira@gmail.com>
Date: Wed, 28 Nov 2012 17:14:40 -0200
Subject: [PATCH] [Mezuro] show_project and new_repository views working

---
 plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb    |  5 +++++
 plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb | 33 +++++++++++++++++++++------------
 plugins/mezuro/views/content_viewer/show_project.rhtml                    |  2 +-
 plugins/mezuro/views/mezuro_plugin_repository/new_repository.html.erb     | 29 ++++++++++++++++++++++++-----
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb
index 0f10263..721462a 100644
--- a/plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb
+++ b/plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb
@@ -24,6 +24,11 @@ class MezuroPluginProfileController < ProfileController
   def project_content_has_errors?
     not @content.errors[:base].nil?
   end
+  
+  def redirect_to_error_page(message)
+    message = URI.escape(CGI.escape(process_error_message(message)),'.')
+    redirect_to "/profile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
+  end
 
 end
 
diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
index acc0f61..7e925e0 100644
--- a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
+++ b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
@@ -3,24 +3,33 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   
   def new_repository
-    puts "\n\n\n\n\n\n\n\n\n\n\n\n\n"
-    puts "chegou aqui"
     @project_content = profile.articles.find(params[:id])
-    puts @project_content.inspect
+    
+    @repository_types = Kalibro::Repository.repository_types
+    #@repository_type_select = []
+    #repository_types.each do |repository_type|
+    #  @repository_type_select.push [repository_type,repository_type]
+    #end
+    
+    configurations = Kalibro::Configuration.all
+    @configuration_select = []
+    configurations.each do |configuration|
+      @configuration_select.push [configuration.name,configuration.id] 
+    end
   end
   
   def create_repository
-    id = params[:id]
-=begin
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
-    metric_configuration.save
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
+    project_content = profile.articles.find(params[:id])
+    project_content_name = project_content.name
+    
+    repository = Kalibro::Repository.new( params[:repository] )
+    repository.save(project_content.project_id)
+    
+    if( repository.errors.empty? )
+      redirect_to "/#{profile.identifier}/#{project_content_name.downcase.gsub(/\s/, '-')}"
     else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+      redirect_to_error_page repository.errors[0].message
     end
-=end
   end
   
   def processing(repository_id)
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 11597fc..6675c01 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -21,7 +21,7 @@
   
   <%= _('Repositories') %>
   <% @page.repositories.each do |repository| %>
-    <%  repository.name %>
+    <%= repository.name %>
   <% end %>
   
   <br>
diff --git a/plugins/mezuro/views/mezuro_plugin_repository/new_repository.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/new_repository.html.erb
index b2202bd..1e5cfc5 100644
--- a/plugins/mezuro/views/mezuro_plugin_repository/new_repository.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_repository/new_repository.html.erb
@@ -1,17 +1,37 @@
-<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
-
 <h2><%= @project_content.name %> Project</h2>
 
 <% form_for :repository, :url => {:action =>"create_repository", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
+  <%= hidden_field_tag :id, @project_content.id %>
   
   <p>
     <%= f.label :name, "Name:" %>
     <%= f.text_field :name %>
   </p>
   <p>
+    <%= f.label :description, "Description:" %>
+    <%= f.text_field :description %>
+  </p>
+  
+  <%= required labelled_form_field _('License'),
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.create_license_options) %><br/>
+  <p>
+  
+  <p>
+    <%= f.label :process_period, "Process Period:" %>
+    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ) %>
+  </p>
     <%= f.label :type, "Type:" %>
-    <%= f.select :type, [["GIT","GIT"], ["SVN", "SVN"]] %>
+    <%= f.select :type, @repository_types %>
+  </p>
+  
+  <p>
+    <%= f.label :address, "Address:" %>
+    <%= f.text_field :address %>
+  </p>
+  
+  </p>
+    <%= f.label :configuration_id, "Configuration:" %>
+    <%= f.select :configuration_id, @configuration_select %>
   </p>
 
   <p>
@@ -19,4 +39,3 @@
   </p>
 
 <% end %>
-
--
libgit2 0.21.2