Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu

* 'ntu' of https://github.com/Rulingcom/orbit: Preventing site default design being deleted.
2012-12-27 12:22:19 +08:00 · 2012-12-27 12:22:19 +08:00 · 34ed8ae39c
parent 177a409508 cfb65dd056
commit 34ed8ae39c
1 changed files with 6 additions and 1 deletions
--- a/app/controllers/admin/designs_controller.rb
+++ b/app/controllers/admin/designs_controller.rb
@ -94,7 +94,12 @@ class Admin::DesignsController < OrbitBackendController

  def destroy
    @design = Design.find(params[:id])
-    @design.destroy
+    if @site.design == @design
+      flash[:error] = "Failed! You can not delete a design that used by default "
+    else
+      @design.destroy
+      flash[:notice] = "Successfully deleted design."
+    end
    redirect_to admin_designs_url
  end