Commit 97410c9373ee885e54d962a394205e9fe2b9dd4b
1 parent
85a233b3
Exists in
master
and in
22 other branches
ActionItem85: udating system
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@781 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
4 additions
and
5 deletions
Show diff stats
app/controllers/application.rb
@@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base | @@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base | ||
39 | 39 | ||
40 | def load_profile | 40 | def load_profile |
41 | @profile = Profile.find_by_identifier(params[:profile]) | 41 | @profile = Profile.find_by_identifier(params[:profile]) |
42 | - raise "The profile must be loaded %s" % params.inspect if @profile.nil? | 42 | + raise "The profile must be loaded %s" % params[:profile].to_s if @profile.nil? |
43 | end | 43 | end |
44 | 44 | ||
45 | def self.acts_as_environment_admin_controller | 45 | def self.acts_as_environment_admin_controller |
app/controllers/environment_admin/edit_template_controller.rb
@@ -4,10 +4,9 @@ class EditTemplateController < EnvironmentAdminController | @@ -4,10 +4,9 @@ class EditTemplateController < EnvironmentAdminController | ||
4 | 4 | ||
5 | def block_types | 5 | def block_types |
6 | { | 6 | { |
7 | - #'ListBlock' => _("List Block"), | ||
8 | - #'LinkBlock' => _("Link Block"), | ||
9 | - #'RecentDocumentsBlock' => _('Recent documents'), | ||
10 | - 'Design::MainBlock' => _('Main content block'), | 7 | + 'ListBlock' => _("List Block"), |
8 | + 'LinkBlock' => _("Link Block"), | ||
9 | + 'RecentDocumentsBlock' => _('Recent documents'), | ||
11 | } | 10 | } |
12 | end | 11 | end |
13 | 12 |