@@ -1,7 +1,7 @@ <% if @article %> - <%= render :partial => 'blogs/articles/article', :object => @article, :locals => {:mode => :single} %> - <%= render :partial => 'comments/list', :locals => {:commentable => @article, :comments => @article.approved_comments} %> + <%= render :partial => 'blogs/articles/article', :object => @article, :locals => { :mode => :single } %> + <%= render :partial => 'comments/list', :locals => { :commentable => @article, :comments => @article.approved_comments } %> <% if @article.accept_comments? %> - <%= render :partial => 'comments/form', :locals => {:commentable => @article} %> + <%= render :partial => 'comments/form', :locals => { :commentable => @article } %> <% end %> <% end %> engines/adva_blog/app/views/blogs/articles/show.html.erb @@ -66,7 +66,6 @@ class BaseController < ApplicationController end def return_from(action, options = {}) - p params[:return_to] URI.unescape(params[:return_to] || begin url = Registry.get(:redirect, action) url = Registry.get(:redirect, url) if url.is_a?(Symbol) engines/adva_cms/app/controllers/base_controller.rb @@ -39,7 +39,7 @@ module Admin::BaseHelper def link_to_profile(site = nil, options = {}) name = options[:name].nil? ? t(:'adva.links.profile') : options[:name] - site = nil if site.new_record? + site = nil if site.try(:new_record?) link_to(name, admin_user_path(site, current_user)) end engines/adva_cms/app/helpers/admin/base_helper.rb @@ -18,6 +18,9 @@ .visible_for { display: none; } +.anonymous { + display: auto; +} /* LISTS */ engines/adva_cms/public/stylesheets/adva_cms/common.css @@ -21,7 +21,7 @@ module IntegrationTests click_link 'Sections' click_link 'New' fill_in 'title', :with => 'the page' - choose 'section_type_page' + select 'Page' click_button 'commit' request.url.should =~ %r(/admin/sites/\d+/sections/\d+/articles) end engines/adva_cms/test/integration/admin/custom_templates_test.rb @@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper') class AdminBaseHelperTest < ActionView::TestCase include Admin::BaseHelper + include Admin::UsersHelper attr_accessor :request @@ -10,12 +11,10 @@ class AdminBaseHelperTest < ActionView::TestCase @site = Site.first @section = @site.sections.first @article = @section.articles.first - stub(self).current_user.returns User.new + stub(self).current_user.returns User.first - stub(self).admin_sites_path.returns 'admin_sites_path' - stub(self).admin_site_user_path.returns 'admin_site_user_path' - stub(self).admin_users_path.returns 'admin_users_path' - stub(self).admin_user_path.returns 'admin_user_path' + @admin_site_user_path = %r(/admin/sites/[\d]+/users/[\d]+) + @admin_user_path = %r(/admin/users/[\d]+) @controller = TestController.new @request = ActionController::TestRequest.new @@ -36,9 +35,9 @@ class AdminBaseHelperTest < ActionView::TestCase form_for(:article, @article, :builder => TestFormBuilder, &block) output_buffer end - + include ::BaseHelper - + test "#save_or_cancel_links uses only button if no cancel url is given" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f) } @@ -48,7 +47,7 @@ class AdminBaseHelperTest < ActionView::TestCase buttons.should_not have_tag('a', 'Cancel') end end - + test "#save_or_cancel_links uses all parts if cancel url is given" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f, :cancel_url => 'cancel url') } @@ -58,93 +57,90 @@ class AdminBaseHelperTest < ActionView::TestCase buttons.should have_tag('a[href=?]', 'cancel url', 'Cancel') end end - + test "#save_or_cancel_links uses custom save text" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f, :save_text => 'save text') } html.should have_tag('input[type=?][value=?]', 'submit', 'save text') end - + test "#save_or_cancel_links uses custom or text" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f, :cancel_url => 'cancel url', :or_text => 'or text') } html.should =~ /or text/ end - + test "#save_or_cancel_links uses custom cancel text" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f, :cancel_url => 'cancel url', :cancel_text => 'cancel text') } html.should have_tag('a[href=?]', 'cancel url', 'cancel text') end - + test "#save_or_cancel_links uses custom save attributes" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f, :save => { :class => 'save class' }) } html.should have_tag('input[type=?][class=?]', 'submit', 'save class') end - + test "#save_or_cancel_links uses custom cancel attributes" do stub(self).protect_against_forgery? { false } # let's make it easier html = build_form { |f| save_or_cancel_links(f, :cancel_url => 'cancel url', :cancel => { :class => 'cancel class' }) } html.should have_tag('a[href=?][class=?]', 'cancel url', 'cancel class') end - # admin_site_select_tag - test "#admin_site_select_tag with current user being a superuser - it shows the site overview option in the site select menu" do - stub(current_user).has_role?(:superuser).returns true - admin_site_select_tag.should have_tag('select#site_select option[value=?]', 'admin_sites_path') - end - - test "#admin_site_select_tag with current user being a superuser - it shows the user manager option in the site select menu" do - stub(current_user).has_role?(:superuser).returns true - admin_site_select_tag.should have_tag('select#site_select option[value=?]', 'admin_users_path') - end - - test "#admin_site_select_tag with current user not being a superuser - it shows the site overview option in the site select menu" do - admin_site_select_tag.should_not have_tag('select#site_select option[value=?]', 'admin_sites_path') - end - - test "#admin_site_select_tag with current user not being a superuser - it shows the user manager option in the site select menu" do - admin_site_select_tag.should_not have_tag('select#site_select option[value=?]', 'admin_users_path') - end + # not in use ... + + # # admin_site_select_tag + # test "#admin_site_select_tag with current user being a superuser + # it shows the site overview option in the site select menu" do + # stub(current_user).has_role?(:superuser).returns true + # admin_site_select_tag.should have_tag('select#site_select option[value=?]', 'admin_sites_path') + # end + # + # test "#admin_site_select_tag with current user being a superuser + # it shows the user manager option in the site select menu" do + # stub(current_user).has_role?(:superuser).returns true + # admin_site_select_tag.should have_tag('select#site_select option[value=?]', 'admin_users_path') + # end + # + # test "#admin_site_select_tag with current user not being a superuser + # it shows the site overview option in the site select menu" do + # admin_site_select_tag.should_not have_tag('select#site_select option[value=?]', 'admin_sites_path') + # end + # + # test "#admin_site_select_tag with current user not being a superuser + # it shows the user manager option in the site select menu" do + # admin_site_select_tag.should_not have_tag('select#site_select option[value=?]', 'admin_users_path') + # end # link_to_profile - test "#link_to_profile returns admin/sites/1/users/1 as a profile link if site is set" do - link_to_profile(@site).should == "<a href=\"admin_site_user_path\">Profile</a>" + test "#link_to_profile links to admin/sites/1/users/1 if site is given" do + link_to_profile(@site).should =~ @admin_site_user_path end - test "#link_to_profile returns admin/users/1 as a profile link if no site is set" do - link_to_profile.should == "<a href=\"admin_user_path\">Profile</a>" + test "#link_to_profile links to admin/users/1 if no site is given" do + link_to_profile.should =~ @admin_user_path end - - test "#link_to_profile returns admin/users/1 as a profile link if site is a new record" do - link_to_profile(Site.new).should == "<a href=\"admin_user_path\">Profile</a>" - end - - test "#link_to_profile returns custom link name for profile if specified" do - link_to_profile(Site.new, :name => 'Dummy').should == "<a href=\"admin_user_path\">Dummy</a>" + + test "#link_to_profile links to admin/users/1 if site is a new record" do + link_to_profile(Site.new).should =~ @admin_user_path end - - test "#link_to_profile returns admin/users/1 as a profile link if site is set but user is a superuser" do - stub(current_user).has_role?(:superuser).returns true - link_to_profile(@site).should == "<a href=\"admin_user_path\">Profile</a>" + + test "#link_to_profile links to custom link name for profile if specified" do + link_to_profile(Site.new, :name => 'Dummy').should =~ />Dummy</ end end class CachedPagesHelperTest < ActionView::TestCase include Admin::BaseHelper - + def setup super @page = CachedPage.first - + @time_now = Time.local 2008, 1, 2, 12 @yesterday = Time.local 2008, 1, 1, 12 - + stub(Time).now.returns @time_now # wtf ... time_now_in_words ignores the timezone stub(Time.zone).now.returns @time_now stub(Time.zone.now).yesterday.returns @yesterday @@ -160,7 +156,7 @@ class CachedPagesHelperTest < ActionView::TestCase @page.updated_at = @time_now - 6.hours page_cached_at(@page).should =~ /Today, / end - + test "#page_cached_at returns a formatted date if the cached page was updated before today" do @page.updated_at = @yesterday page_cached_at(@page).should == 'Jan 01, 2008' engines/adva_cms/test/unit/helpers/admin/base_helper_test.rb @@ -1,5 +1,6 @@ +<%# @comment ||= commentable.comments.build %> <% if @comment %> - <div id="comment_form_wrapper"> + <% authorized_tag(:div, :create, @comment, :id => 'comment_form_wrapper') do %> <div id="registered_author" style="display: none;"> <p><%= t(:'adva.info.greeting_logged_in') %></p> </div> @@ -37,5 +38,5 @@ <%= link_to_remote_comment_preview %> </p> <% end %> - </div> + <% end %> <% end %> engines/adva_comments/app/views/comments/_form.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render :partial => 'admin/theme_files/files' %> -<% end %> - <h2><%= t(:'adva.theme_files.titles.upload') %></h2> <% form_tag upload_admin_theme_files_path(@site, @theme.id), { :method => :post, :multipart => true } do %> @@ -15,3 +11,5 @@ <%= link_to t(:'adva.common.cancel'), admin_theme_path(@site, @theme.id) %> <% end %> <% end %> + +<% render :partial => 'sidebar' %> \ No newline at end of file engines/adva_themes/app/views/admin/theme_files/import.html.erb @@ -6,11 +6,11 @@ module RolesHelper def role_to_css_class(role) return unless role - if role.instance_of? Rbac::Role::Author - [role.context.author_type.underscore, role.context.author_id].join('-') + ' ' + role_to_default_css_class(role) - else - role_to_default_css_class(role) + roles = '' + if role.instance_of?(Rbac::Role::Author) && role.context.author_type + roles << [role.context.author_type.underscore, role.context.author_id].join('-') + ' ' end + roles << role_to_default_css_class(role) end # Includes a javascript tag that will load a javascript snippet @@ -30,22 +30,14 @@ module RolesHelper } var aid = Cookie.get('aid'); if(aid) { - $(document).ready(function() { - authorize_elements(['anonymous-' + aid]); - }); - // $.ajax({ - // url: '/anonymouses/' + aid + '.js', - // type: 'get', - // async: false, - // dataType: 'script' - // }); + $(document).ready(function() { authorize_elements(['anonymous-' + aid]); }); } js end def authorized_tag(name, action, object, options = {}, &block) add_authorizing_css_classes! options, action, object - content_tag name, options, &block + content_tag(name, options, &block) end def authorized_link_to(text, url, action, object, options = {}) engines/adva_user/app/helpers/roles_helper.rb @@ -63,8 +63,7 @@ module With def define_test_method(target, context, options = {}) method_name = generate_test_method_name(context) target.send :define_method, method_name, &lambda { - @_with_contexts = (context.parents << context).map(&:name) - [:before, :action, :assertion, :after].each do |stage| + call_stage = lambda do |stage| @_with_current_stage = stage context.collect(stage).map do |call| if @_expected_exception and stage == :action @@ -74,9 +73,15 @@ module With end end end + begin + @_with_contexts = (context.parents << context).map(&:name) + [:before, :action, :assertion].each { |stage| call_stage.call(stage) } + ensure + call_stage.call(:after) + end } end - + def generate_test_method_name(context) contexts = context.parents << context assertions = context.calls(:assertion) test/with/lib/with/context.rb 8c99adf380a819410d1b3ee8815d6c397fb81638 Sven Fuchs svenfuchs@artweb-design.de http://github.com/svenfuchs/adva_cms/commit/eee97cc8ae5d1862432b4689981e3808f23aecf4 eee97cc8ae5d1862432b4689981e3808f23aecf4 2009-04-24T06:36:36-07:00 2009-04-24T06:35:44-07:00 further bugfixes after interface refactoring 98208cef9085c3bfac1556adfd45a97fee353519 Sven Fuchs svenfuchs@artweb-design.de