Modified: trunk/app/helpers/application_helper.rb (2376 => 2377)
--- trunk/app/helpers/application_helper.rb 2010-04-09 10:51:39 UTC (rev 2376)
+++ trunk/app/helpers/application_helper.rb 2010-04-15 14:39:48 UTC (rev 2377)
@@ -824,7 +824,7 @@
def workflows_for_attribution_form
workflows = Workflow.find(:all, :select => 'workflows.id, workflows.title, users.name',
:joins => 'LEFT OUTER JOIN users ON workflows.contributor_type = "User" AND workflows.contributor_id = users.id',
- :order => 'workflows.title ASC')
+ :order => 'workflows.id ASC')
workflows.select { |w| Authorization.is_authorized?('show', 'Workflow', w.id, current_user) }
end
@@ -832,7 +832,7 @@
def blobs_for_attribution_form
blobs = Blob.find(:all, :select => 'blobs.id, blobs.title, users.name',
:joins => 'LEFT OUTER JOIN users ON blobs.contributor_type = "User" AND blobs.contributor_id = users.id',
- :order => 'blobs.title ASC')
+ :order => 'blobs.id ASC')
blobs.select { |b| Authorization.is_authorized?('show', 'Blob', b.id, current_user) }
end
Modified: trunk/app/views/contributions/_credit_attribution_form.rhtml (2376 => 2377)
--- trunk/app/views/contributions/_credit_attribution_form.rhtml 2010-04-09 10:51:39 UTC (rev 2376)
+++ trunk/app/views/contributions/_credit_attribution_form.rhtml 2010-04-15 14:39:48 UTC (rev 2377)
@@ -140,7 +140,7 @@
<br />
<select id="existingworkflows_dropdown" style="width: 280px;">
<% workflows_for_attribution_form.each do |w| %>
- <option value="<%= w.id %>"><%= h(w.title) -%> (<%= h(w.name) -%>)</option>
+ <option value="<%= w.id %>"><%=h "#{w.id}: #{w.title} (#{w.name})" -%></option>
<% end %>
</select>
<br />
@@ -154,7 +154,7 @@
<br />
<select id="existingfiles_dropdown" style="width: 280px;">
<% blobs_for_attribution_form.each do |b| %>
- <option value="<%= b.id %>"><%= h(b.title) -%> (<%= h(b.name) -%>)</option>
+ <option value="<%= b.id %>"><%=h "#{b.id}: #{b.title} (#{b.name})" -%></option>
<% end %>
</select>
<br />