diff --git a/classes/projects.rb b/classes/projects.rb index 95f3084..37ac712 100644 --- a/classes/projects.rb +++ b/classes/projects.rb @@ -517,10 +517,13 @@ class ProjectsActions end def delete_snapshot(id, snap) + proj_path = get_project_path(id) snap_path = get_project_snap(id, snap) - - if File.exist?(snap_path) - FileUtils.rm_rf(snap_path) + snap_path_base = File.join(proj_path, PROJECTS_STRUCTURE[:SNAP]) + unless snap_path == snap_path_base || "#{snap_path}/" == snap_path_base || snap_path == "#{snap_path_base}/" + if File.exist?(snap_path) + FileUtils.rm_rf(snap_path) + end end end end diff --git a/views/prjshot1.erb b/views/prjshot1.erb index c6935ab..63d1be7 100644 --- a/views/prjshot1.erb +++ b/views/prjshot1.erb @@ -11,8 +11,8 @@ <% @snap_list.each do |item| %> - <%= item %> - <%= item %> + <% end %> diff --git a/views/prjshot_delete.erb b/views/prjshot_delete.erb index e9b57f1..e266186 100644 --- a/views/prjshot_delete.erb +++ b/views/prjshot_delete.erb @@ -1,7 +1,7 @@ <%= erb :header %>

Удаление сатрых версий пакетов проекта <%= @proj_name %>

-
+