From 00947a33fc0e1cd1002573821187306b3a0387c8 Mon Sep 17 00:00:00 2001
From: Gabriela Navarro <navarro1703@gmail.com>
Date: Tue, 14 Oct 2014 10:36:06 -0300
Subject: [PATCH] Remove name of edition page and finality as mandatory field

---
 lib/software_info.rb                                                       | 18 ------------------
 views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb |  7 -------
 views/mpog_software_plugin_myprofile/_public_software_info.html.erb        |  1 -
 3 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/lib/software_info.rb b/lib/software_info.rb
index 2cd03c0..1e71eec 100644
--- a/lib/software_info.rb
+++ b/lib/software_info.rb
@@ -14,19 +14,6 @@ class SoftwareInfo < ActiveRecord::Base
 
  has_one :software_categories
 
-  #validates :features, :objectives,
-  # :presence=>true,
-  # :length => {
-  #   :maximum => 4000,
-  #   :too_long => _("Software features is too long (maximum is 4000 characters)")
-  # }
-
-  #validate :validate_operating_platform, :validate_acronym, :valid_software_info, :valid_databases, :valid_operating_systems
- 
-  #validate :finality, :presence => {:message => "Finality cannot be blank"}
-  validate :validate_finality 
-  
-
   # used on find_by_contents
   scope :like_search, lambda{ |name|
     joins(:community).where("name ilike ?", "%#{name}%")
@@ -119,11 +106,6 @@ class SoftwareInfo < ActiveRecord::Base
     end
   end
 
-  def validate_finality 
-    self.errors.add(:finality, _("can't be blank")) if self.finality.blank? && self.errors.messages[:finality].nil?
-  end
-
-
   def valid_operating_systems
     self.errors.add(:operating_system, _(": at least one must be filled")) if self.operating_systems.empty?
   end
diff --git a/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb b/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb
index 2c739b1..c5e4f7d 100644
--- a/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb
+++ b/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb
@@ -1,12 +1,5 @@
 <h2><%= _('Software Information') %></h2>
 
-<%= label_tag("name", _('Name'), {:class => 'formlabel'}) %>
-
-<div id='software-name-field' class='formfield'>
-  <span id='software-hostname'><%= @profile.environment.default_hostname %>/</span>
-  <%= text_field_tag(:name, @profile.software_info.community.name) %>
-</div>
-    
 <h3> <%= _("Finality") %> </h3>
 <div id="finality">
   <%= text_field_tag("software[finality]", @profile.software_info.finality) %>
diff --git a/views/mpog_software_plugin_myprofile/_public_software_info.html.erb b/views/mpog_software_plugin_myprofile/_public_software_info.html.erb
index fc743b1..021ce16 100644
--- a/views/mpog_software_plugin_myprofile/_public_software_info.html.erb
+++ b/views/mpog_software_plugin_myprofile/_public_software_info.html.erb
@@ -98,7 +98,6 @@
     <% if not k == "id" and not k == "software_info_id" %>
       <%= check_box_tag "software_categories[#{k}]", "true", !v.blank? %>
       <%= label_tag k.to_sym, _("#{k.gsub("_", " ").capitalize}") %><br />
-      <% puts "="*80, v%>
     <% end %>
   <% end %>
 
--
libgit2 0.21.2