browsercms 3.0.5 → 3.0.6

data/app/controllers/cms/categories_controller.rb

@@ -1,2 +1,5 @@
 class Cms::CategoriesController < Cms::ContentBlockController
-end
+  def show
+    redirect_to cms_categories_url
+  end
+end

data/app/controllers/cms/links_controller.rb

@@ -2,8 +2,8 @@ class Cms::LinksController < Cms::BaseController
 
   before_filter :set_toolbar_tab
   before_filter :load_section, :only => [:new, :create, :move_to]
-  before_filter :load_link, :only => [:destroy]
-  before_filter :load_draft_link, :only => [:edit, :update]
+  before_filter :load_link, :only => [:destroy, :update]
+  before_filter :load_draft_link, :only => [:edit]
   
   def new
     @link = Link.new(:section => @section)

data/app/controllers/cms/portlets_controller.rb

@@ -2,7 +2,7 @@ class Cms::PortletsController < Cms::ContentBlockController
   
   protected
     def load_blocks
-      @blocks = Portlet.paginate(
+      @blocks = Portlet.search(params[:search]).paginate(
         :page => params[:page],
         :order => params[:order] || "name",
         :conditions => ["deleted = ?", false]
@@ -37,4 +37,4 @@ class Cms::PortletsController < Cms::ContentBlockController
     def blocks_path
       cms_portlets_path
     end
-end
+end

data/app/controllers/cms/tags_controller.rb

@@ -6,4 +6,7 @@ class Cms::TagsController < Cms::ContentBlockController
       format.js { render :inline => "var tags = #{@blocks.map{|e| e.name}.to_json}" }
     end
   end
-end
+  def show
+    redirect_to cms_tags_url
+  end
+end

data/app/helpers/application_helper.rb

@@ -1,21 +1,3 @@
 # Any code for core CMS should go in /cms/application_helper.rb rather than here.
 module ApplicationHelper
-
-  def require_stylesheet_link(sources=(), content_area=:html_head)
-    @required_stylesheet_links ||= []
-    new_links = sources.to_a - @required_stylesheet_links
-    if !new_links.empty?
-      @required_stylesheet_links |= new_links
-      content_for(content_area, stylesheet_link_tag(new_links))
-    end
-  end
-
-  def require_javascript_include(sources=(), content_area=:html_head)
-    @required_javascript_includes ||= []
-    new_links = sources.to_a - @required_javascript_includes
-    if !new_links.empty?
-      @required_javascript_includes |= new_links
-      content_for(content_area, javascript_include_tag(new_links))
-    end
-  end
 end

data/app/helpers/cms/application_helper.rb

@@ -1,6 +1,24 @@
 # Methods added to this helper will be available to all templates in the cms.
 module Cms
   module ApplicationHelper
+
+    def require_stylesheet_link(sources=(), content_area=:html_head)
+      @required_stylesheet_links ||= []
+      new_links = sources.to_a - @required_stylesheet_links
+      if !new_links.empty?
+        @required_stylesheet_links |= new_links
+        content_for(content_area, stylesheet_link_tag(new_links))
+      end
+    end
+
+    def require_javascript_include(sources=(), content_area=:html_head)
+      @required_javascript_includes ||= []
+      new_links = sources.to_a - @required_javascript_includes
+      if !new_links.empty?
+        @required_javascript_includes |= new_links
+        content_for(content_area, javascript_include_tag(new_links))
+      end
+    end
     
     def searchable_sections(selected = nil)
       root = Section.root.first

data/app/models/portlet.rb

@@ -1,6 +1,7 @@
 class Portlet < ActiveRecord::Base
 
   validates_presence_of :name
+  is_searchable
 
   #These are here simply to temporarily hold these values
   #Makes it easy to pass them through the process of selecting a portlet type
@@ -154,4 +155,4 @@ class Portlet < ActiveRecord::Base
     end      
   end  
   
-end
+end

data/app/models/tag.rb

@@ -5,7 +5,7 @@ class Tag < ActiveRecord::Base
   validates_uniqueness_of :name
   
   attr_accessor :size
-  
+  is_searchable  
   named_scope :named, lambda{|tag| {:conditions => ["tags.name = ? ", tag]} }
   
   # Returns an array of tags with a count attribute

data/app/models/user.rb

@@ -74,6 +74,14 @@ class User < ActiveRecord::Base
     "#{full_name} (#{login})"
   end
 
+  def full_name_or_login
+    if full_name.strip.blank?
+      login
+    else
+      full_name
+    end
+  end
+
   # This is to show a formated date on the input form. I'm unsure that
   # this is the best way to solve this, but it works.
   def expires_at_formatted

data/app/views/cms/pages/_edit_connector.html.erb

@@ -18,4 +18,10 @@
     <%= render_connectable connectable %>
 </div>
 <% require_javascript_include ['jquery', 'cms/application'] %>
-
+<% content_for :html_head do %>
+    <% if  @authenticity_token_loaded.nil? && protect_against_forgery? %><script type="text/javascript">
+      jQuery(function($){
+        $.cms.authenticity_token = '<%= form_authenticity_token %>'
+      })
+    </script><% end %><% @authenticity_token_loaded = true %>
+<% end %>

data/app/views/cms/users/index.html.erb

@@ -26,7 +26,7 @@
     <% @users.each do |user|%>
     <tr>
         <td class="first"></td>
-        <td><div class="dividers"><%= link_to "#{user.first_name} #{user.last_name}", edit_cms_user_path(user) %></div></td>
+        <td><div class="dividers"><%= link_to "#{user.full_name_or_login}", edit_cms_user_path(user) %></div></td>
 	      <td><div class="dividers"><%= link_to user.email, "mailto:#{user.email}" %></div></td>
         <td>
             <div class="dividers">

data/browsercms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{browsercms}
-  s.version = "3.0.5"
+  s.version = "3.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BrowserMedia"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2009-12-30}
   s.email = %q{github@browsermedia.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/test/unit/helpers/application_helper_test.rb

@@ -26,9 +26,6 @@ class Cms::ApplicationHelperTest < ActionView::TestCase
     assert_equal "bar", determine_order("foo", "bar")
   end
   
-end
-
-class ApplicationHelperTest < ActionView::TestCase
   # returns content supplied to this method for testing
   def content_for(name, content = nil, &block)
     return name, content

data/test/unit/models/user_test.rb

@@ -66,7 +66,18 @@ class UserTest < ActiveSupport::TestCase
       assert !@user.valid?
     end
   end
-
+  test "full name or login" do
+    login = 'robbo'
+    fn = 'Bob'
+    ln = 'Smith'
+    u = User.new(:login => 'robbo')
+    assert_equal login, u.full_name_or_login 
+    u.first_name = fn
+    assert_equal fn, u.full_name_or_login 
+    u.last_name = ln
+    assert_equal fn + ' ' + ln, u.full_name_or_login 
+    
+  end
 end
 
 class UserPermissionsTest < ActiveSupport::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: browsercms
 version: !ruby/object:Gem::Version 
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors: 
 - BrowserMedia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2009-12-30 00:00:00 -05:00
 default_executable: 
 dependencies: []