Diff
Modified: branches/rails2/app/views/memberships/new.rhtml (2826 => 2827)
--- branches/rails2/app/views/memberships/new.rhtml 2011-11-18 15:03:00 UTC (rev 2826)
+++ branches/rails2/app/views/memberships/new.rhtml 2011-11-18 15:10:21 UTC (rev 2827)
@@ -18,7 +18,7 @@
<small>(Administrator: <%= name @network.user_id -%>)</small>
<% else -%>
<b>Select group:</b><br/>
- <%= select_tag "membership[network_id]", options_from_collection_for_select(Network.find(:all, :order => "title ASC", :conditions => ["new_member_policy != 'invitation_only'"]), :id.to_i, :title), :style => "width: 360px; margin-top: 0.3em; margin-bottom: 0.5em" %>
+ <%= select_tag "membership[network_id]", options_from_collection_for_select(Network.find(:all, :order => "title ASC", :conditions => ["new_member_policy != 'invitation_only'"]), 'id', 'title'), :style => "width: 360px; margin-top: 0.3em; margin-bottom: 0.5em" %>
<% end -%>
</div>
Modified: branches/rails2/app/views/networks/show.rhtml (2826 => 2827)
--- branches/rails2/app/views/networks/show.rhtml 2011-11-18 15:03:00 UTC (rev 2826)
+++ branches/rails2/app/views/networks/show.rhtml 2011-11-18 15:10:21 UTC (rev 2827)
@@ -208,7 +208,7 @@
</div>
</div>
-<% if @network.administrator?(current_user.id) %>
+<% if logged_in? && @network.administrator?(current_user.id) %>
<% memberships = @network.memberships_accepted %>
<a name="manage_memberships"></a>
Modified: branches/rails2/lib/workflow_processors/bio_extract.rb (2826 => 2827)
--- branches/rails2/lib/workflow_processors/bio_extract.rb 2011-11-18 15:03:00 UTC (rev 2826)
+++ branches/rails2/lib/workflow_processors/bio_extract.rb 2011-11-18 15:10:21 UTC (rev 2827)
@@ -42,7 +42,7 @@
file.rewind
return !bioextract_model.nil?
rescue
- puts $!
+ Rails.logger.info $!
return false
end
end
Modified: branches/rails2/lib/workflow_processors/galaxy.rb (2826 => 2827)
--- branches/rails2/lib/workflow_processors/galaxy.rb 2011-11-18 15:03:00 UTC (rev 2826)
+++ branches/rails2/lib/workflow_processors/galaxy.rb 2011-11-18 15:10:21 UTC (rev 2827)
@@ -176,7 +176,7 @@
workflow
rescue
- puts $!
+ Rails.logger.info $!
nil
end
end
Modified: branches/rails2/lib/workflow_processors/rapid_miner.rb (2826 => 2827)
--- branches/rails2/lib/workflow_processors/rapid_miner.rb 2011-11-18 15:03:00 UTC (rev 2826)
+++ branches/rails2/lib/workflow_processors/rapid_miner.rb 2011-11-18 15:10:21 UTC (rev 2827)
@@ -45,7 +45,7 @@
file.rewind
return !rapid_miner_model.nil?
rescue
- puts $!
+ Rails.logger.info $!
return false
end
end
@@ -291,7 +291,7 @@
package
rescue
- puts $!
+ Rails.logger.info $!
nil
end
end
Modified: branches/rails2/lib/workflow_processors/taverna2.rb (2826 => 2827)
--- branches/rails2/lib/workflow_processors/taverna2.rb 2011-11-18 15:03:00 UTC (rev 2826)
+++ branches/rails2/lib/workflow_processors/taverna2.rb 2011-11-18 15:10:21 UTC (rev 2827)
@@ -310,7 +310,6 @@
processors_element << build('processor') do |processor_element|
-puts "PROCESSOR NAME = #{processor.name}"
processor_element << build('name', processor.name) if processor.name
processor_element << build('description', processor.description) if processor.description
processor_element << build('type', processor.type) if processor.type