Move name and image fields from community to software edit page

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

Move name and image fields from community to software edit page
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Luciano Prestes
1 parent d02c2ee7
Showing 17 changed files with 86 additions and 45 deletions Show diff stats
controllers/software_communities_plugin_myprofile_controller.rb
features/public_software_validation.feature
features/software_registration.feature
features/step_definitions/software_communities_steps.rb
lib/software_info.rb
public/style.css
test/functional/profile_editor_controller_test.rb
test/functional/software_communities_plugin_myprofile_controller_test.rb
test/helpers/plugin_test_helper.rb
test/unit/software_info_validation_test.rb
test/unit/software_registration_test.rb
views/profile_editor/_software_community.html.erb
views/profile_editor/edit_software_community.html.erb
views/software_communities_plugin_myprofile/_license_info_fields.html.erb
views/software_communities_plugin_myprofile/_main_software_editor_extras.html.erb
views/software_communities_plugin_myprofile/edit_software.html.erb
views/software_communities_plugin_myprofile/new_software.html.erb
@@ -40,6 +40,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     update_software_atributes
  
     return unless request.post?
+
     @software_info = constroy_software
     software_info_insert_models.call(@list_libraries, 'libraries')
     software_info_insert_models.call(@list_languages, 'software_languages')
@@ -48,6 +49,10 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
  
     begin
       @software_info.save!
+
+      @community = @software_info.community
+      @community.update_attributes!(params[:community])
+
       if params[:commit] == _('Save and Configure Community')
         redirect_to :controller => 'profile_editor', :action => 'edit'
       else
@@ -155,6 +160,8 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
                         params[:software_info].merge({
                           :environment => environment,
                           :name => params[:community][:name],
+                          :identifier => params[:community][:identifier],
+                          :image_builder => params[:community][:image_builder],
                           :license_info => @license_info,
                           :another_license_version => another_license_version,
                           :another_license_link => another_license_link }))
@@ -16,7 +16,7 @@ Feature: edit adherent fields
     And I press "Save changes"
     And I go to /myprofile/mpog-admin
     And I follow "Create a new software"
-    And I fill in "community_name" with "basic software"
+    And I fill in "community_name_id" with "basic software"
     And I fill in "software_info_finality" with "basic software finality"
     And I press "Create"
  
@@ -12,7 +12,7 @@ Feature: edit public software information
     And I press "Save changes"
     And I go to /myprofile/mpog-admin
     And I follow "Create a new software"
-    And I fill in "community_name" with "basic software"
+    And I fill in "community_name_id" with "basic software"
     And I fill in "software_info_finality" with "basic software finality"
     And I type in "gp" in autocomplete list "#license_info_version" and I choose "GPL-2"
     And I press "Create"
@@ -131,6 +131,8 @@ Given /^the following softwares$/ do |table|
     software_info.community = Community.create(:name=>item[:name])
  
     software_info.acronym = item[:acronym] if item[:acronym]
+    software_info.finality = item[:finality] if item[:finality]
+    software_info.finality ||= "something"
     software_info.operating_platform = item[:operating_platform] if item[:operating_platform]
     software_info.objectives = item[:objectives] if item[:objectives]
     software_info.features = item[:features] if item[:features]
@@ -159,6 +159,8 @@ class SoftwareInfo &lt; ActiveRecord::Base
   def self.create_after_moderation(requestor, attributes = {})
     environment = attributes.delete(:environment)
     name = attributes.delete(:name)
+    identifier = attributes.delete(:identifier)
+    image_builder = attributes.delete(:image_builder)
     license_info = attributes.delete(:license_info)
     another_license_version = attributes.delete(:another_license_version)
     another_license_link = attributes.delete(:another_license_link)
@@ -175,7 +177,12 @@ class SoftwareInfo &lt; ActiveRecord::Base
       )
     else
       software_template = Community["software"]
-      community = Community.new(:name => name)
+
+      community_hash = {:name => name}
+      community_hash[:identifier] = identifier
+      community_hash[:image_builder] = image_builder if image_builder
+
+      community = Community.new(community_hash)
       community.environment = environment
  
       if (!software_template.blank? && software_template.is_template)
@@ -528,3 +528,8 @@ div.step-explanation {
   margin-top: 2px;
   margin-bottom: 15px;
 }
+
+div#finality textarea {
+  resize: none;
+  height: 100px;
+}
@@ -119,7 +119,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     community
   end
  
-  def create_software_info name, finality = "", acronym = ""
+  def create_software_info name, finality = "something", acronym = ""
     community = create_community(name)
     software_info = SoftwareInfo.new
     software_info.community = community
@@ -225,8 +225,8 @@ class SoftwareCommunitiesPluginMyprofileControllerTest &lt; ActionController::TestC
  
     post(
       :new_software,
-      :community => {:name =>"New Software"},
-      :software_info => {:finality => "", :repository_link => ""},
+      :community => {:name =>"New Software", :identifier => "new-software"},
+      :software_info => {:finality => "something", :repository_link => ""},
       :license =>{:license_infos_id => LicenseInfo.last.id},
       :profile => @person.identifier
     )
@@ -243,8 +243,8 @@ class SoftwareCommunitiesPluginMyprofileControllerTest &lt; ActionController::TestC
  
     post(
       :new_software,
-      :community => { :name =>"New Software" },
-      :software_info => { :finality => "", :repository_link => "" },
+      :community => { :name => "New Software", :identifier => "new-software" },
+      :software_info => { :finality => "something", :repository_link => "" },
       :license => { :license_infos_id => license_another.id,
         :version => another_license_version,
         :link=> another_license_link
@@ -13,14 +13,15 @@ module PluginTestHelper
     community
   end
  
-  def create_software_info name, finality = "", acronym = ""
+  def create_software_info name, finality = "something", acronym = ""
     community = create_community(name)
     software_info = SoftwareInfo.new
     software_info.community = community
     software_info.finality = finality
     software_info.acronym = acronym
     software_info.public_software = true
-    software_info.save
+    software_info.save!
+
     software_info
   end
  
@@ -40,7 +40,8 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
                       :e_arq => true,
                       :operating_platform => true,
                       :objectives => "",
-                      :features => ""
+                      :features => "",
+                      :finality => "something"
                     )
     @software_info.software_languages << @software_language
     @software_info.software_databases << @software_database
@@ -30,7 +30,8 @@ class SoftwareRegistrationTest &lt; ActiveSupport::TestCase
     task = CreateSoftware.create!(
             :name => "Teste Two",
             :requestor => person,
-            :environment => @environment
+            :environment => @environment,
+            :finality => "something"
            )
  
     software_count = SoftwareInfo.count
@@ -2,8 +2,6 @@
  
   <%= required_fields_message %>
  
-  <%= required f.text_field(:name) %>
-
   <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_exec(&content) }.join("") %>
  
 <% if @environment.enabled?('enable_organization_url_change') %>
@@ -21,16 +21,6 @@
  
   <%= render :partial => 'software_community', :locals => { :f => f } %>
  
-  <div id="profile_change_picture_title">
-    <h2><%= _('Change picture') %></h2>
-    <span><%= unchangeable_privacy_field @profile %></span>
-  </div>
-  <div id="profile_change_picture">
-    <%= f.fields_for :image_builder, @profile.image do |i| %>
-      <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
-    <% end %>
-  </div>
-
   <h2><%= _('Privacy options') %></h2>
  
   <% if profile.person? %>
@@ -2,7 +2,6 @@
   <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
 <% end %>
  
-<h3><%= _("License Version: ") %></h3>
 <%= text_field_tag "license_info[version]", license_version, :id=>"license_info_version", :class=>"license_info_version", :placeholder=>_('Autocomplete field, type some license') %>
 <%= hidden_field_tag "license[license_infos_id]", license_id, :id=>"license_info_id", :class=>"license_info_id", :data => {:label=>license_version} %>
  
 <h1><%= @profile.software_info.name + _(' Information') %></h1>
  
+<h3> <%= _("Name") %> </h3>
+<div id="name">
+  <%= text_field_tag("community[name]", @profile.name) %>
+</div>
+
 <h3> <%= _("Acronym") %> </h3>
 <div id="acronym">
   <%= text_field_tag("software[acronym]", @profile.software_info.acronym, :maxlength=>"10") %>
@@ -7,9 +12,19 @@
  
 <h3> <%= _("Finality") %> </h3>
 <div id="finality">
-  <%= text_area_tag "software[finality]", @profile.software_info.finality, :placeholder => _("It is a software of..."), :cols => 40, :rows => 5, :maxlength => 140%>
+  <%= text_area_tag "software[finality]", @profile.software_info.finality, :placeholder => _("What is the software for?"), :maxlength => 120 %>
+</div>
+
+<div id="profile_change_picture_title">
+  <h3><%= _('Software Logo') %></h3>
+</div>
+<div id="profile_change_picture">
+    <%= f.fields_for :image_builder, @profile.image do |i| %>
+      <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+    <% end %>
 </div>
  
+<h3><%= _("License Version: ") %></h3>
 <div id='licenses'>
   <%= render :partial => "license_info_fields", :locals => {
       :license_version => @license_version,
@@ -25,3 +40,4 @@
   <%= text_field_tag("software[repository_link]", @profile.software_info.repository_link, :class => "improve_input_size") %>
 </div>
  
+
 <% tabs = [] %>
  
-<%= error_messages_for :software_info %>
+<%= error_messages_for :software_info, :community %>
  
-<%= labelled_form_for :software_communities_plugin_myprofile, :html => { :multipart => true, :id => 'edit-form' } do |f| %>
+<%= labelled_form_for :community, :html => { :multipart => true, :id => 'edit-form' } do |f| %>
  
-<% tabs << {:title => _("Software"), :id => 'basic-info',
-  :content => (render :partial => 'main_software_editor_extras')} %>
+  <% tabs << {:title => _("Software"), :id => 'basic-info',
+    :content => (render :partial => 'main_software_editor_extras', :locals => {:f => f})} %>
  
-<% tabs << {:title => _("Specifications"), :id => 'especific-info',
-  :content => (render :partial => 'public_software_info')} %>
+  <% tabs << {:title => _("Specifications"), :id => 'especific-info',
+    :content => (render :partial => 'public_software_info')} %>
  
-<%= render_tabs(tabs) %>
+  <%= render_tabs(tabs) %>
  
-<% button_bar do %>
+  <% button_bar do %>
     <%= submit_button(:save, _('Save')) %>
     <%= submit_button(:save, _('Save and Configure Community')) %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-<% end %>
+  <% end %>
 <% end %>
@@ -43,23 +43,37 @@
     <div id='software-name-field' class='formfield'>
  
       <span id='software-hostname'><%= environment.default_hostname %>/</span>
-      <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %>
+      <%= required text_field(:community, :identifier, :size => 30, :maxlength => 100) %>
     </div>
  
     <%= fields_for @software_info do |swf| %>
-      <div class="formfield type-text">
+      <div id="finality" class="formfield type-text">
         <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %>
-        <%= required swf.text_area(:finality, :placeholder => _("What is the software?"), :cols => 40, :rows => 5, :maxlength => 140) %>
+        <%= required swf.text_area(:finality, :placeholder => _("What is the software for?"), :maxlength => 120) %>
       </div>
     <% end %>
  
-    <div class="formfieldline">
-      <%= render :partial => "license_info_fields", :locals => {
-        :license_version => "",
-        :license_id => "",
-        :another_version=>"",
-        :another_link=>""
-      } %>
+    <div id="profile_change_picture_title" class="formlabel">
+      <label>
+        <%= _('Software Logo') %>
+      </label>
+    </div>
+    <div id="profile_change_picture">
+        <%= f.fields_for :image_builder, @community.image do |i| %>
+          <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+        <% end %>
+    </div>
+
+    <div id="profile_change_picture_title" class="formlabel formfieldline">
+      <label>
+        <%= _("License Version: ") %>
+      </label>
+        <%= render :partial => "license_info_fields", :locals => {
+          :license_version => "",
+          :license_id => "",
+          :another_version=>"",
+          :another_link=>""
+        } %>
     </div>
  
     <%= fields_for @software_info do |swf| %>
...	...	@@ -40,6 +40,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController
40	40	update_software_atributes
41	41
42	42	return unless request.post?
	43	+
43	44	@software_info = constroy_software
44	45	software_info_insert_models.call(@list_libraries, 'libraries')
45	46	software_info_insert_models.call(@list_languages, 'software_languages')
...	...	@@ -48,6 +49,10 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController
48	49
49	50	begin
50	51	@software_info.save!
	52	+
	53	+ @community = @software_info.community
	54	+ @community.update_attributes!(params[:community])
	55	+
51	56	if params[:commit] == _('Save and Configure Community')
52	57	redirect_to :controller => 'profile_editor', :action => 'edit'
53	58	else
...	...	@@ -155,6 +160,8 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController
155	160	params[:software_info].merge({
156	161	:environment => environment,
157	162	:name => params[:community][:name],
	163	+ :identifier => params[:community][:identifier],
	164	+ :image_builder => params[:community][:image_builder],
158	165	:license_info => @license_info,
159	166	:another_license_version => another_license_version,
160	167	:another_license_link => another_license_link }))
...	...
...	...	@@ -16,7 +16,7 @@ Feature: edit adherent fields
16	16	And I press "Save changes"
17	17	And I go to /myprofile/mpog-admin
18	18	And I follow "Create a new software"
19		- And I fill in "community_name" with "basic software"
	19	+ And I fill in "community_name_id" with "basic software"
20	20	And I fill in "software_info_finality" with "basic software finality"
21	21	And I press "Create"
22	22
...	...
...	...	@@ -12,7 +12,7 @@ Feature: edit public software information
12	12	And I press "Save changes"
13	13	And I go to /myprofile/mpog-admin
14	14	And I follow "Create a new software"
15		- And I fill in "community_name" with "basic software"
	15	+ And I fill in "community_name_id" with "basic software"
16	16	And I fill in "software_info_finality" with "basic software finality"
17	17	And I type in "gp" in autocomplete list "#license_info_version" and I choose "GPL-2"
18	18	And I press "Create"
...	...
...	...	@@ -131,6 +131,8 @@ Given /^the following softwares$/ do \|table\|
131	131	software_info.community = Community.create(:name=>item[:name])
132	132
133	133	software_info.acronym = item[:acronym] if item[:acronym]
	134	+ software_info.finality = item[:finality] if item[:finality]
	135	+ software_info.finality \|\|= "something"
134	136	software_info.operating_platform = item[:operating_platform] if item[:operating_platform]
135	137	software_info.objectives = item[:objectives] if item[:objectives]
136	138	software_info.features = item[:features] if item[:features]
...	...
...	...	@@ -159,6 +159,8 @@ class SoftwareInfo < ActiveRecord::Base
159	159	def self.create_after_moderation(requestor, attributes = {})
160	160	environment = attributes.delete(:environment)
161	161	name = attributes.delete(:name)
	162	+ identifier = attributes.delete(:identifier)
	163	+ image_builder = attributes.delete(:image_builder)
162	164	license_info = attributes.delete(:license_info)
163	165	another_license_version = attributes.delete(:another_license_version)
164	166	another_license_link = attributes.delete(:another_license_link)
...	...	@@ -175,7 +177,12 @@ class SoftwareInfo < ActiveRecord::Base
175	177	)
176	178	else
177	179	software_template = Community["software"]
178		- community = Community.new(:name => name)
	180	+
	181	+ community_hash = {:name => name}
	182	+ community_hash[:identifier] = identifier
	183	+ community_hash[:image_builder] = image_builder if image_builder
	184	+
	185	+ community = Community.new(community_hash)
179	186	community.environment = environment
180	187
181	188	if (!software_template.blank? && software_template.is_template)
...	...
...	...	@@ -528,3 +528,8 @@ div.step-explanation {
528	528	margin-top: 2px;
529	529	margin-bottom: 15px;
530	530	}
	531	+
	532	+div#finality textarea {
	533	+ resize: none;
	534	+ height: 100px;
	535	+}
...	...
...	...	@@ -119,7 +119,7 @@ class ProfileEditorControllerTest < ActionController::TestCase
119	119	community
120	120	end
121	121
122		- def create_software_info name, finality = "", acronym = ""
	122	+ def create_software_info name, finality = "something", acronym = ""
123	123	community = create_community(name)
124	124	software_info = SoftwareInfo.new
125	125	software_info.community = community
...	...
...	...	@@ -225,8 +225,8 @@ class SoftwareCommunitiesPluginMyprofileControllerTest < ActionController::TestC
225	225
226	226	post(
227	227	:new_software,
228		- :community => {:name =>"New Software"},
229		- :software_info => {:finality => "", :repository_link => ""},
	228	+ :community => {:name =>"New Software", :identifier => "new-software"},
	229	+ :software_info => {:finality => "something", :repository_link => ""},
230	230	:license =>{:license_infos_id => LicenseInfo.last.id},
231	231	:profile => @person.identifier
232	232	)
...	...	@@ -243,8 +243,8 @@ class SoftwareCommunitiesPluginMyprofileControllerTest < ActionController::TestC
243	243
244	244	post(
245	245	:new_software,
246		- :community => { :name =>"New Software" },
247		- :software_info => { :finality => "", :repository_link => "" },
	246	+ :community => { :name => "New Software", :identifier => "new-software" },
	247	+ :software_info => { :finality => "something", :repository_link => "" },
248	248	:license => { :license_infos_id => license_another.id,
249	249	:version => another_license_version,
250	250	:link=> another_license_link
...	...
...	...	@@ -13,14 +13,15 @@ module PluginTestHelper
13	13	community
14	14	end
15	15
16		- def create_software_info name, finality = "", acronym = ""
	16	+ def create_software_info name, finality = "something", acronym = ""
17	17	community = create_community(name)
18	18	software_info = SoftwareInfo.new
19	19	software_info.community = community
20	20	software_info.finality = finality
21	21	software_info.acronym = acronym
22	22	software_info.public_software = true
23		- software_info.save
	23	+ software_info.save!
	24	+
24	25	software_info
25	26	end
26	27
...	...
...	...	@@ -40,7 +40,8 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
40	40	:e_arq => true,
41	41	:operating_platform => true,
42	42	:objectives => "",
43		- :features => ""
	43	+ :features => "",
	44	+ :finality => "something"
44	45	)
45	46	@software_info.software_languages << @software_language
46	47	@software_info.software_databases << @software_database
...	...