[myexperiment-hackers] [2246] trunk/app/views: Fixed bug with licenses not defaulting to the right license in the select box .

[noreply]

Revision

2246

Author

drn05r

Date

2009-07-15 06:15:21 -0400 (Wed, 15 Jul 2009)

Log Message

Fixed bug with licenses not defaulting to the right license in the select box.  NOT TESTED

Modified Paths

• trunk/app/views/blobs/_license_form.rhtml
• trunk/app/views/blobs/_table.rhtml
• trunk/app/views/workflows/_license_form.rhtml
• trunk/app/views/workflows/_table.rhtml

Diff

Modified: trunk/app/views/blobs/_license_form.rhtml (2245 => 2246)

--- trunk/app/views/blobs/_license_form.rhtml	2009-07-13 08:13:58 UTC (rev 2245)
+++ trunk/app/views/blobs/_license_form.rhtml	2009-07-15 10:15:21 UTC (rev 2246)
@@ -30,6 +30,7 @@
         
         <%= collection_select(:blob, :license_id, License.find(:all), :id, :title, {}, 
               {: remote_function(:update => 'license_info',
+	       :selected => @license.id,
                :url ="" {:controller => 'licenses', :action="" 'update_license_info' },
                :with => "'license_id=' + escape(value)")}) %>
         </div>

Modified: trunk/app/views/blobs/_table.rhtml (2245 => 2246)

--- trunk/app/views/blobs/_table.rhtml	2009-07-13 08:13:58 UTC (rev 2245)
+++ trunk/app/views/blobs/_table.rhtml	2009-07-15 10:15:21 UTC (rev 2246)
@@ -61,7 +61,7 @@
 							</p>
 						<% end %>
 						
-						<p style="font-size:85%;"><b>License: </b><% @license = License.find(blob.license_id) %><%= link_to h(@license.url), license_path(@license) %></p>
+						<p style="font-size:85%;"><b>License: </b><% @license = License.find(blob.license_id) %><%= link_to h(@license.title), license_path(@license) %></p>
 						
 						<div class="desc" style="font-size: 85%;">
 							<% if blob.body and blob.body.length > 0 %>

Modified: trunk/app/views/workflows/_license_form.rhtml (2245 => 2246)

--- trunk/app/views/workflows/_license_form.rhtml	2009-07-13 08:13:58 UTC (rev 2245)
+++ trunk/app/views/workflows/_license_form.rhtml	2009-07-15 10:15:21 UTC (rev 2246)
@@ -30,6 +30,7 @@
         
         <%= collection_select(:workflow, :license_id, License.find(:all), :id, :title, {}, 
               {: remote_function(:update => 'license_info',
+	       :selected => @license.id,
                :url ="" {:controller => 'licenses', :action="" 'update_license_info' },
                :with => "'license_id=' + escape(value)")}) %>
         </div>

Modified: trunk/app/views/workflows/_table.rhtml (2245 => 2246)

--- trunk/app/views/workflows/_table.rhtml	2009-07-13 08:13:58 UTC (rev 2245)
+++ trunk/app/views/workflows/_table.rhtml	2009-07-15 10:15:21 UTC (rev 2246)
@@ -68,7 +68,7 @@
 					  	</p>
 					  <% end %>
 						
-						<p style="font-size:85%;"><b>License: </b><% @license = License.find(workflow.license_id) %><%= link_to h(@license.url), license_path(@license) %></p>
+						<p style="font-size:85%;"><b>License: </b><% @license = License.find(workflow.license_id) %><%= link_to h(@license.title), license_path(@license) %></p>
 					  
 						<table style="width: 99%;">
 							<tbody>