[inq-commits] SF.net SVN: inq: [791] trunk/server/web

[<gr...@us...>]

Revision: 791
          http://inq.svn.sourceforge.net/inq/?rev=791&view=rev
Author:   greycat
Date:     2008-03-28 03:57:03 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
Implemented single computer profile changing. Closes #226

Modified Paths:
--------------
    trunk/server/web/app/controllers/computers_controller.rb
    trunk/server/web/app/views/layouts/computer_tabs.rhtml
    trunk/server/web/public/stylesheets/inq.css

Modified: trunk/server/web/app/controllers/computers_controller.rb
===================================================================
--- trunk/server/web/app/controllers/computers_controller.rb	2008-03-28 10:45:38 UTC (rev 790)
+++ trunk/server/web/app/controllers/computers_controller.rb	2008-03-28 10:57:03 UTC (rev 791)
@@ -678,6 +678,13 @@
 		redirect_to :action => 'hw', :id => params[:id], :testing => @testing_number
 	end
 
+	def update_profile
+		prepare_computer_and_testing
+		@computer.profile_id = params[:profile][:id]
+		@computer.save!
+		redirect_to :action => 'hw', :id => params[:id], :testing => @testing_number
+	end
+
 	private
 	
 	RESULT_MAPPING = {
@@ -690,6 +697,8 @@
 	def prepare_computer_tabs
 		prepare_computer_and_testing
 
+		@profiles = Profile.list_for_model(@computer.model_id).map { |x| [x.name, x.id] }
+
 		now = Time.new
 		@computer_stages = (@computer.computer_stages + (@computer.order ? @computer.order.order_stages.find_all { |stage| stage.stage != 'manufacturing' } : [])).inject([]) do |a, stage|
                         a << {  :stage => stage.stage, :person => stage.person,
@@ -743,15 +752,11 @@
 		@testing = @sorted_testings[@testing_number]
 	end
 
-
 	def dump_comparison(comparison)
 		Marshal.dump(comparison)
 	end
 
-
 	def load_comparison(str)
 		Marshal.load(str)
 	end
-
-
 end

Modified: trunk/server/web/app/views/layouts/computer_tabs.rhtml
===================================================================
--- trunk/server/web/app/views/layouts/computer_tabs.rhtml	2008-03-28 10:45:38 UTC (rev 790)
+++ trunk/server/web/app/views/layouts/computer_tabs.rhtml	2008-03-28 10:57:03 UTC (rev 791)
@@ -23,9 +23,9 @@
 		<td id="title_bar_doc">Order: <%= link_to @computer.order.buyer_order_number, { :controller => :orders, :action => :show, :id => @computer.order } %> (<%= link_to  truncate(@computer.order.customer, 40).gsub(/ /, '&nbsp;'), { :controller => :orders, :action => :search, :order => { :customer => @computer.order.customer } } %>)</td>
 <% end %>
 <% if @computer.profile %>
-		<td id="title_bar_profile">Profile: <%= link_to @computer.profile.name, { :controller => :profiles, :action => :show, :id => @computer.profile } %></td>
+		<td id="title_bar_profile_show">Profile: <%= link_to @computer.profile.name, { :controller => :profiles, :action => :show, :id => @computer.profile } %><%= link_to_function image_tag('edit.png'), "$('title_bar_profile_show').style.display = 'none'; $('title_bar_profile_edit').style.display = 'table-cell';" %></td>
+		<td id="title_bar_profile_edit"><% form_tag(:action => 'update_profile', :id => @computer.id, :testing => @testing_number) { %>Profile: <%= select :profile, :id, @profiles, :selected => @computer.profile_id %><%= submit_tag 'Apply' %><% } %></td>
 <% end %>
-
 	</tr></table>
 	</div>
 	

Modified: trunk/server/web/public/stylesheets/inq.css
===================================================================
--- trunk/server/web/public/stylesheets/inq.css	2008-03-28 10:45:38 UTC (rev 790)
+++ trunk/server/web/public/stylesheets/inq.css	2008-03-28 10:57:03 UTC (rev 791)
@@ -368,3 +368,7 @@
 	color: #303030;
 	font-style: normal;
 }
+
+#title_bar_profile_edit {
+	display: none;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.