Mercurial > hg > soundsoftware-site

changeset 1334:9397280c138c live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore route for enabling embedded docs through sys controller
author Chris Cannam
date Thu, 20 Jun 2013 12:34:41 +0100
parents 1913ae0bd76a
children 2590a6fb900a
files app/controllers/sys_controller.rb config/routes.rb
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/app/controllers/sys_controller.rb	Thu Jun 20 12:03:53 2013 +0100
+++ b/app/controllers/sys_controller.rb	Thu Jun 20 12:34:41 2013 +0100
@@ -100,11 +100,11 @@
     project = Project.find(params[:id])
     mods = project.enabled_modules
     enable = (params[:enable] == "1")
-    if mods.detect {|m| m.name == "embedded"}
+    if mods.detect {|m| m.name == "redmine_embedded"}
       logger.info "Project #{project.name} currently has Embedded enabled"
       if !enable
         logger.info "Disabling Embedded"
-        modnames = mods.all(:select => :name).collect{|m| m.name}.reject{|n| n == "embedded"}
+        modnames = mods.all(:select => :name).collect{|m| m.name}.reject{|n| n == "redmine_embedded"}
         project.enabled_module_names = modnames
       end
     else
@@ -112,7 +112,7 @@
       if enable
         logger.info "Enabling Embedded"
         modnames = mods.all(:select => :name).collect{|m| m.name}
-        modnames << "embedded"
+        modnames << "redmine_embedded"
         project.enabled_module_names = modnames
       end
     end
--- a/config/routes.rb	Thu Jun 20 12:03:53 2013 +0100
+++ b/config/routes.rb	Thu Jun 20 12:34:41 2013 +0100
@@ -336,6 +336,7 @@
 
   match 'sys/projects', :to => 'sys#projects', :via => :get
   match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
+  match 'sys/projects/:id/embedded.:format', :controller => 'sys', :action => 'set_embedded_active', :conditions => { :method => :post }
   match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
 
   match 'uploads', :to => 'attachments#upload', :via => :post