Download as
Browse Code »

Commit 97410c9373ee885e54d962a394205e9fe2b9dd4b

Authored by LeandroNunes
1 parent 85a233b3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @97410c9
... ... @@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base
39 39  
40 40 def load_profile
41 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 43 end
44 44  
45 45 def self.acts_as_environment_admin_controller
... ...
app/controllers/environment_admin/edit_template_controller.rb
  Diff comments   View file @97410c9
... ... @@ -4,10 +4,9 @@ class EditTemplateController < EnvironmentAdminController
4 4  
5 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 11 end
13 12  
... ...