Download as
Browse Code »

Commit 7c86f0109321d27d9c23983fe7ce98695b05730d

Authored by LeandroNunes
1 parent cf5172f0
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

ActionItem0: loadding the corrects boxes 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@90 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 11 additions and 2 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @7c86f01
@@ -44,7 +44,6 @@ class ApplicationController < ActionController::Base @@ -44,7 +44,6 @@ class ApplicationController < ActionController::Base
44 end 44 end
45 45
46 def boxes_by_template(template) 46 def boxes_by_template(template)
47 - #f = YAML.load_file("#{TEMPLATE_DIR_PATH}/#{template}/#{template}.yml")  
48 f = YAML.load_file("#{RAILS_ROOT}/public/templates/default/default.yml") 47 f = YAML.load_file("#{RAILS_ROOT}/public/templates/default/default.yml")
49 number_of_boxes = f[template.to_s]["number_of_boxes"] 48 number_of_boxes = f[template.to_s]["number_of_boxes"]
50 raise _("The file #{template}.yml it's not a valid template filename") if number_of_boxes.nil? 49 raise _("The file #{template}.yml it's not a valid template filename") if number_of_boxes.nil?
app/controllers/edit_template_controller.rb
  Diff comments   View file @7c86f01
@@ -2,4 +2,9 @@ class EditTemplateController < ApplicationController @@ -2,4 +2,9 @@ class EditTemplateController < ApplicationController
2 2
3 uses_manage_template :edit => true 3 uses_manage_template :edit => true
4 4
  5 + def test
  6 + @bli = true
  7 + render :action => 'index'
  8 + end
  9 +
5 end 10 end
test/functional/edit_template_controller_test.rb
  Diff comments   View file @7c86f01
@@ -13,6 +13,11 @@ class EditTemplateControllerTest < Test::Unit::TestCase @@ -13,6 +13,11 @@ class EditTemplateControllerTest < Test::Unit::TestCase
13 13
14 # Replace this with your real tests. 14 # Replace this with your real tests.
15 def test_truth 15 def test_truth
  16 + get :test
  17 + assert_response :success
  18 + assert_template 'index'
  19 +
16 assert true 20 assert true
  21 + assert !assigns(:leo)
17 end 22 end
18 end 23 end
test/mocks/test/virtual_community.rb
  Diff comments   View file @7c86f01
1 -require 'app/models/virtual_community' 1 +require File.expand_path(File.dirname(__FILE__) + "/../../../app/models/virtual_community")
2 2
3 class VirtualCommunity < ActiveRecord::Base 3 class VirtualCommunity < ActiveRecord::Base
4 def self.available_features 4 def self.available_features