Menu
▾
▴
[stp-svn] SF.net SVN: stp: [275] trunk/stp-ror/app/models
|
From: <jud...@us...> - 2006-05-04 21:29:21
|
Revision: 275 Author: judith_osdl Date: 2006-05-04 14:29:16 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=275&view=rev Log Message: ----------- Changes to views and scripts to match the new softwares_types table and the name->patch_name column name change in softwares. This fixes a problem with requesting tests. Remove unused search tags. Fix ID field in edit form. Modified Paths: -------------- trunk/stp-ror/app/controllers/test_cases_controller.rb trunk/stp-ror/app/controllers/test_requests_controller.rb trunk/stp-ror/app/models/software.rb trunk/stp-ror/app/models/test_case.rb trunk/stp-ror/app/models/test_request.rb trunk/stp-ror/app/views/layouts/application.rhtml trunk/stp-ror/app/views/softwares/_form.rhtml trunk/stp-ror/app/views/test_cases/show.rhtml trunk/stp-ror/app/views/test_requests/_software.rhtml trunk/stp-ror/app/views/test_requests/_test_options.rhtml trunk/stp-ror/app/views/test_requests/edit.rhtml Modified: trunk/stp-ror/app/controllers/test_cases_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_cases_controller.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/controllers/test_cases_controller.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -8,7 +8,7 @@ def add_software test_case = TestCase.find(params['id']) software = Software.find(params['software']['id']) - if test_case.softwares.push_with_attributes software, params['softwares_test_cases'] + if test_case.softwares.push_with_attributes software, params['software_types_test_cases'] flash[:notice] = 'Test was successfully updated.' redirect_to :action => 'show', :id => test_case else Modified: trunk/stp-ror/app/controllers/test_requests_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -31,6 +31,7 @@ softwares_test_requests = @params[:softwares_test_requests] unless softwares_test_requests.nil? then + soap = SOAP::WSDLDriverFactory.new(WSDL_URL).createDriver softwares_test_requests.each { |software_id, attr| # @@ -38,8 +39,9 @@ # in order to insert a row into the relation table. But then I # barely know how to use rails... # - software = Software.find(software_id) next if attr[:value].empty? + my_patch = soap.PatchFindByName(attr[:value]) + software = Software.find(my_patch) rc = @test_request.softwares.push_with_attributes(software, { :value => attr[:value] }) } @@ -128,7 +130,7 @@ @distros = Distro.find(:all, :order => 'descriptor') @test_cases = TestCase.find(:all, :order => 'descriptor') @host_types = HostType.find(:all, :order => 'descriptor') - @softwares = Software.find(:all, :order => 'name') + @softwares = SoftwareType.find(:all, :order => 'name') @test_request_states = TestRequestState.find(:all, :order => 'name') end Modified: trunk/stp-ror/app/models/software.rb =================================================================== --- trunk/stp-ror/app/models/software.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/models/software.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -3,5 +3,5 @@ # class Software < ActiveRecord::Base - has_and_belongs_to_many :test_cases + has_many :software_types end Modified: trunk/stp-ror/app/models/test_case.rb =================================================================== --- trunk/stp-ror/app/models/test_case.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/models/test_case.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -5,7 +5,7 @@ class TestCase < ActiveRecord::Base has_and_belongs_to_many :distros, :order => 'descriptor' has_and_belongs_to_many :host_types, :order => 'descriptor' - has_and_belongs_to_many :softwares, :order => 'install_priority, name' + has_and_belongs_to_many :software_types, :order => 'install_priority, name' has_many :parameters, :order => 'descriptor' has_many :metrics Modified: trunk/stp-ror/app/models/test_request.rb =================================================================== --- trunk/stp-ror/app/models/test_request.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/models/test_request.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -24,7 +24,7 @@ has_and_belongs_to_many :parameters, :order => 'descriptor' - has_and_belongs_to_many :softwares, :order => 'name' + has_and_belongs_to_many :softwares, :order => 'softwares.patch_name' has_one :host Modified: trunk/stp-ror/app/views/layouts/application.rhtml =================================================================== --- trunk/stp-ror/app/views/layouts/application.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/layouts/application.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -28,17 +28,9 @@ <li class="sub"><div class="title">Search</div></li> <ul class="sub"> <li class="sub"> - <%= link_to 'Build Sets', {:controller => 'build_sets', - :action => 'search'} %> - </li> - <li class="sub"> <%= link_to 'Test Requests', {:controller => 'test_requests', :action => 'search'} %> </li> - <li class="sub"> - <%= link_to 'Sub Test Requests', {:controller => 'sub_test_requests', - :action => 'search'} %> - </li> </ul> </ul> </ul> Modified: trunk/stp-ror/app/views/softwares/_form.rhtml =================================================================== --- trunk/stp-ror/app/views/softwares/_form.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/softwares/_form.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -8,6 +8,9 @@ <%= datetime_select 'software', 'updated_on' %></p> <p><label for="software_name">Name</label><br/> -<%= text_field 'software', 'name' %></p> +<%= text_field 'software', 'patch_name' %></p> + +<p><label for="software_type_id">Name</label><br/> +<%= text_field 'software', 'software_type_id' %></p> <!--[eoform:software]--> Modified: trunk/stp-ror/app/views/test_cases/show.rhtml =================================================================== --- trunk/stp-ror/app/views/test_cases/show.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_cases/show.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -32,7 +32,7 @@ <tr> <td><b>Add software component:</b></td> <td><%= select('software', 'id', @softwares.collect { |software| [ software.name, software.id ] }, { :include_blank => true }) %></td> - <td><%= text_field 'softwares_test_cases', 'install_priority' %></td> + <td><%= text_field 'software_types_test_cases', 'install_priority' %></td> <td><%= submit_tag 'Add' %></td> </tr> </table> Modified: trunk/stp-ror/app/views/test_requests/_software.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_software.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_requests/_software.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -4,7 +4,7 @@ <%= text_field_tag "softwares_test_requests[#{software.id}][value]", software[:value] %> <%= observe_field "softwares_test_requests[#{software.id}][value]", - :frequency => 0.5, :update => "software_name_#{software.id}_div", + :frequency => 1.0, :update => "software_name_#{software.id}_div", :url => { :action => 'verify_patch_name' }, :with => "'patch_name=' + escape(value) + '&software_name=#{software['name']}'" %> </td> Modified: trunk/stp-ror/app/views/test_requests/_test_options.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_test_options.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_requests/_test_options.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -22,11 +22,11 @@ </p> <% end %> -<% if @test_case.softwares.length > 0 then %> +<% if @test_case.software_types.length > 0 then %> <p> <table> <caption>Software Components</caption> - <%= render_collection_of_partials "software", @test_case.softwares %> + <%= render_collection_of_partials "software", @test_case.software_types %> </table> </p> <% end %> Modified: trunk/stp-ror/app/views/test_requests/edit.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/edit.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_requests/edit.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -4,7 +4,7 @@ <table> <tr> <td align="right" valign="top">ID:</td> - <td><%= @test_request.test_case[:id] %></td> + <td><%= @test_request.id %></td> </tr> <tr> <td align="right" valign="top">Test:</td> @@ -46,7 +46,7 @@ <%= render_collection_of_partials "parameter", @test_request.parameters %> </table> <% end %> -<% if @test_request.test_case.softwares.length > 0 then %> +<% if @test_request.test_case.software_types.length > 0 then %> <hr /> <table> <caption>Software Components</caption> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
