Diff
Modified: trunk/app/controllers/topics_controller.rb (3505 => 3506)
--- trunk/app/controllers/topics_controller.rb 2013-04-11 23:29:41 UTC (rev 3505)
+++ trunk/app/controllers/topics_controller.rb 2013-04-12 08:45:13 UTC (rev 3506)
@@ -8,7 +8,7 @@
# declare sweepers and which actions should invoke them
- cache_sweeper :workflow_sweeper, : [ :create, :create_version, :launch, :update, :update_version, :destroy_version, :destroy ]
+ cache_sweeper :workflow_sweeper, : [ :create, :create_version, :launch, :update, :update_version, :destroy ]
cache_sweeper :download_viewing_sweeper, : [ :show, :download, :named_download, :launch ]
cache_sweeper :permission_sweeper, : [ :create, :update, :destroy ]
cache_sweeper :bookmark_sweeper, : [ :destroy, :favourite, :favourite_delete ]
Modified: trunk/app/controllers/workflows_controller.rb (3505 => 3506)
--- trunk/app/controllers/workflows_controller.rb 2013-04-11 23:29:41 UTC (rev 3505)
+++ trunk/app/controllers/workflows_controller.rb 2013-04-12 08:45:13 UTC (rev 3506)
@@ -24,7 +24,7 @@
before_filter :check_context, : :index
# declare sweepers and which actions should invoke them
- cache_sweeper :workflow_sweeper, : [ :create, :create_version, :launch, :update, :update_version, :destroy_version, :destroy ]
+ cache_sweeper :workflow_sweeper, : [ :create, :create_version, :launch, :update, :update_version, :destroy ]
cache_sweeper :download_viewing_sweeper, : [ :show, :download, :named_download, :galaxy_tool, :galaxy_tool_download, :launch ]
cache_sweeper :permission_sweeper, : [ :create, :update, :destroy ]
cache_sweeper :bookmark_sweeper, : [ :destroy, :favourite, :favourite_delete ]
@@ -625,38 +625,7 @@
end
end
end
-
- # DELETE /workflows/1;destroy_version?version=1
- def destroy_version
- workflow_title = @viewing_version.title
-
- if params[:version]
- if @workflow.find_version(params[:version]) == false
- render_404("Workflow version not found.")
- end
- if @workflow.versions.length < 2
- error("Can't delete all versions", " is not allowed", :version)
- end
- success = @workflow.destroy_version(params[:version].to_i)
- else
- success = false
- end
-
- respond_to do |format|
- if success
- flash[:notice] = "Workflow version #{params[:version]}: \"#{workflow_title}\" has been deleted"
- format.html { redirect_to workflow_url(@workflow) }
- else
- flash[:error] = "Failed to delete Workflow version. Please report this."
- if params[:version]
- format.html { redirect_to(workflow_url(@workflow) + "?version=#{params[:version]}") }
- else
- format.html { redirect_to workflow_url(@workflow) }
- end
- end
- end
- end
-
+
def tag_suggestions
@suggestions = @workflow.get_tag_suggestions
end
@@ -724,7 +693,6 @@
"create" => "create",
"create_version" => "edit",
"destroy" => "destroy",
- "destroy_version" => "edit",
"download" => "download",
"edit" => "edit",
"edit_version" => "edit",
Modified: trunk/app/views/workflows/show.rhtml (3505 => 3506)
--- trunk/app/views/workflows/show.rhtml 2013-04-11 23:29:41 UTC (rev 3505)
+++ trunk/app/views/workflows/show.rhtml 2013-04-12 08:45:13 UTC (rev 3506)
@@ -67,13 +67,6 @@
<div style="margin-top: 1em;">
<ul class="sectionIcons" style="margin-top: 0.7em; margin-bottom: 0.6em;">
<li style="margin-left: 0;"><%= icon('edit', workflow_version_edit_url(@workflow.id, @viewing_version.version), nil, nil, "Edit This Version") %></li>
- <% if false %>
- <% if @latest_version_number > 1 %>
- <% if Authorization.check("destroy", @workflow, current_user) %>
- <li><%= icon('destroy', workflow_version_delete_url(@workflow.id, @viewing_version.version), nil, { :confirm => "Are you sure you want to delete this version (Version address@hidden) of the Workflow file (including title/description metadata)?", :method => :delete }, 'Delete This Version') %></li>
- <% end %>
- <% end %>
- <% end %>
</ul>
</div>
<% end %>
Modified: trunk/config/routes.rb (3505 => 3506)
--- trunk/config/routes.rb 2013-04-11 23:29:41 UTC (rev 3505)
+++ trunk/config/routes.rb 2013-04-12 08:45:13 UTC (rev 3506)
@@ -81,8 +81,7 @@
:rate => :post,
:tag => :post,
:create_version => :post,
- :destroy_version => :delete,
- :edit_version => :get,
+ :edit_version => :get,
:update_version => :put,
:process_tag_suggestions => :post,
:tag_suggestions => :get } do |workflow|