From 0e575f49339461b1b14806c6a2eafcaa0096a7d5 Mon Sep 17 00:00:00 2001
From: DanielaFeitosa <DanielaFeitosa@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 30 Jul 2007 19:17:37 +0000
Subject: [PATCH] ActionItem6: Fixing links in views and validation in model of enterprise

---
 app/controllers/enterprise_controller.rb | 1 +
 app/models/enterprise.rb                 | 3 ++-
 app/views/enterprise/_enterprise.rhtml   | 2 +-
 app/views/enterprise/index.rhtml         | 5 +++++
 app/views/enterprise/register_form.rhtml | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/enterprise_controller.rb b/app/controllers/enterprise_controller.rb
index d805486..23a1209 100644
--- a/app/controllers/enterprise_controller.rb
+++ b/app/controllers/enterprise_controller.rb
@@ -14,6 +14,7 @@ class EnterpriseController < ApplicationController
 
   def register
     @enterprise = Enterprise.new(params[:enterprise])
+    @enterprise.identifier = @enterprise.name
     if @enterprise.save
       @enterprise.people << current_user.person
       flash[:notice] = _('Enterprise was succesfully created')
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index fa2bc6b..bdf162b 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -1,5 +1,6 @@
 #A enterprise is a kind of profile. According to the system concept, only enterprises can offer priducts/services
 class Enterprise < Profile
 
-  validates_numericality_of :foundation_year, :only_integer => true
+  validates_numericality_of :foundation_year, :only_integer => true, :allow_nil => true
+
 end
diff --git a/app/views/enterprise/_enterprise.rhtml b/app/views/enterprise/_enterprise.rhtml
index b42ec0f..cfea5a2 100644
--- a/app/views/enterprise/_enterprise.rhtml
+++ b/app/views/enterprise/_enterprise.rhtml
@@ -1 +1 @@
-<li> <%= enterprise.name %> </li>
+<li> <%= link_to enterprise.name %> </li>
diff --git a/app/views/enterprise/index.rhtml b/app/views/enterprise/index.rhtml
index cdd9589..1d47945 100644
--- a/app/views/enterprise/index.rhtml
+++ b/app/views/enterprise/index.rhtml
@@ -3,3 +3,8 @@
 <ul>
   <%= render :partial => 'enterprise', :collection => @my_enterprises %>
 </ul>
+
+<h2> <%= _('Listing pending enterprises') %> </h2>
+<ul>
+  <%= render :partial => 'enterprise', :collection => @pending_enterprises %>
+</ul>
diff --git a/app/views/enterprise/register_form.rhtml b/app/views/enterprise/register_form.rhtml
index 615b002..eecc05f 100644
--- a/app/views/enterprise/register_form.rhtml
+++ b/app/views/enterprise/register_form.rhtml
@@ -31,5 +31,5 @@
 <%= text_area 'enterprise', 'management_information', 'cols' => 40, 'rows' => 20 %></p>
 
 <p><%= submit_tag _('Register') %>
-<%= link_to _('Cancel'), :action => 'register' %></p>
+<%= link_to _('Cancel'), :action => 'index' %></p>
 <% end %>
--
libgit2 0.21.2