[myexperiment-hackers] [2482] branches/biocat/app: Disable the services show page and change the link for the services in the listings to point to the BioCatalogue page .

[noreply]

Revision

2482

Author

jits

Date

2010-07-27 06:52:02 -0400 (Tue, 27 Jul 2010)

Log Message

Disable the services show page and change the link for the services in the listings to point to the BioCatalogue page.

Modified Paths

• branches/biocat/app/controllers/services_controller.rb
• branches/biocat/app/views/services/_table.rhtml

Diff

Modified: branches/biocat/app/controllers/services_controller.rb (2481 => 2482)

--- branches/biocat/app/controllers/services_controller.rb	2010-07-26 14:11:00 UTC (rev 2481)
+++ branches/biocat/app/controllers/services_controller.rb	2010-07-27 10:52:02 UTC (rev 2482)
@@ -5,7 +5,7 @@
 
 class ServicesController < ApplicationController
 
-  before_filter :find_service,  : [:show]
+#  before_filter :find_service,  : [:show]
   before_filter :find_services, : [:all]
   
   # GET /algorithms;search
@@ -37,6 +37,7 @@
   
   # GET /service/1
   def show
+    raise ActionController::UnknownAction.new
   end
   
   protected
@@ -49,22 +50,22 @@
   end
   
   def find_service
-    begin
-      service = Service.find(params[:id])
-      
-      @contributable = service
-      
-      @contributable_entry_url = url_for : false,
-                          :host => base_host,
-                          :id => @contributable.id
-
-      @contributable_label                = @contributable.name
-      @contributable_path                 = service_path(@contributable)
-
-    rescue ActiveRecord::RecordNotFound
-      error("Service not found", "is invalid")
-      return false
-    end
+#    begin
+#      service = Service.find(params[:id])
+#      
+#      @contributable = service
+#      
+#      @contributable_entry_url = url_for : false,
+#                          :host => base_host,
+#                          :id => @contributable.id
+#
+#      @contributable_label                = @contributable.name
+#      @contributable_path                 = service_path(@contributable)
+#
+#    rescue ActiveRecord::RecordNotFound
+#      error("Service not found", "is invalid")
+#      return false
+#    end
   end
   
   private

Modified: branches/biocat/app/views/services/_table.rhtml (2481 => 2482)

--- branches/biocat/app/views/services/_table.rhtml	2010-07-26 14:11:00 UTC (rev 2481)
+++ branches/biocat/app/views/services/_table.rhtml	2010-07-27 10:52:02 UTC (rev 2482)
@@ -29,7 +29,7 @@
 					
             <%= icon "service", nil, nil, nil, '' %>
             <% title = h(service.name) %>
-            <%= link_to(query ? highlight_all(title, query) : title, service_path(service)) %>
+            <%= link_to(query ? highlight_all(title, query) : title, service.uri, :popup => true) %>
 						
 						<% unless service.flag_url.blank? %>
 						  <%= image_tag service.flag_url, :style => "margin-left: 0.5em;", :title => tooltip_title_attrib(h(service.country)), :alt => h(service.country) -%>
@@ -78,7 +78,7 @@
 					
 					<% unless service.wsdl.blank? %>
 					  <p style="font-size: 85%;">
-						  <b>WSDL Location:</b> <%= link_to h(service.wsdl), service.wsdl -%> |
+						  <b>WSDL Location:</b> <%= link_to h(service.wsdl), service.wsdl -%>
  					  </p>
 					<% end %>
 					
@@ -108,9 +108,6 @@
             <p style="font-size: 85%;"><i>This Service has no tags!</i></p>
           <% end %> 
 					
-					<p style="font-size: 85%; text-align: right;">
-						<%= link_to "BioCatalogue Link", service.uri -%>
-					</p>
         </td>
       <% end %>