Merge branch 'master' into api

Leandro Santos
2 parents 7bb5bd94 30ffafc5
Showing 18 changed files with 180 additions and 58 deletions Show diff stats
AUTHORS.md
app/controllers/application_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/helpers/boxes_helper.rb
app/models/block.rb
app/views/box_organizer/edit.html.erb
config/routes.rb
debian/changelog
lib/noosfero.rb
lib/noosfero/version.rb
lib/tasks/doc.rake
lib/tasks/error_messages.rake
test/functional/application_controller_test.rb
test/functional/profile_design_controller_test.rb
test/integration/routing_test.rb
test/unit/block_test.rb
test/unit/boxes_helper_test.rb
test/unit/user_test.rb
@@ -92,6 +92,7 @@ Daniel Alves + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+daniel <dtygel@eita.org.br>
 David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
@@ -120,6 +121,7 @@ Diego Araujo + Rodrigo Souto + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
 Diego + Renan <renanteruoc@gmail.com>
+dtygel <dtygel@gmail.com>
 DylanGuedes <djmgguedes@gmail.com>
 Eduardo Passos <eduardo@risa.localdomain.localhost>
 Eduardo Passos <eduardosteps@gmail.com>
@@ -144,6 +146,7 @@ Italo Valcy &lt;italo@dcc.ufba.br&gt;
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+Jérôme Jutteau <j.jutteau@gmail.com>
 João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
@@ -247,8 +250,10 @@ Tallys Martins &lt;tallysmartins@gmail.com&gt;
 Tallys Martins <tallysmartins@yahoo.com.br>
 tallys <tallys@tallys>
 tallys <tallys@tallys.(none)>
+Thiago Casotti <thiago.casotti@uol.com.br>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
+TWS <tablettws@gmail.com>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
@@ -9,6 +9,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :allow_cross_domain_access
   before_filter :login_required, :if => :private_environment?
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
+  before_filter :redirect_to_current_user
   def verify_members_whitelist
     render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
@@ -192,4 +193,15 @@ class ApplicationController &lt; ActionController::Base
   def private_environment?
     @environment.enabled?(:restrict_to_members)
   end
+
+  def redirect_to_current_user
+    if params[:profile] == '~'
+      if logged_in?
+        redirect_to params.merge(:profile => user.identifier)
+      else
+        render_not_found
+      end
+    end
+  end
+
 end
@@ -4,11 +4,19 @@ class ProfileDesignController &lt; BoxOrganizerController
   protect 'edit_profile_design', :profile
-  before_filter :protect_fixed_block, :only => [:save, :move_block]
+  before_filter :protect_uneditable_block, :only => [:save]
+  before_filter :protect_fixed_block, :only => [:move_block]
+
+  def protect_uneditable_block
+    block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
+    if !current_person.is_admin? && !block.editable?
+      render_access_denied
+    end
+  end
   def protect_fixed_block
     block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
-    if block.fixed && !current_person.is_admin?
+    if !current_person.is_admin? && !block.movable?
       render_access_denied
     end
   end
@@ -190,7 +190,7 @@ module BoxesHelper
       else
         "before-block-#{block.id}"
       end
-    if block.nil? or modifiable?(block)
+    if block.nil? || movable?(block)
       content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
     else
       ""
@@ -199,14 +199,14 @@ module BoxesHelper
   # makes the given block draggable so it can be moved away.
   def block_handle(block)
-    modifiable?(block) ? draggable_element("block-#{block.id}", :revert => true) : ""
+    movable?(block) ? draggable_element("block-#{block.id}", :revert => true) : ""
   end
   def block_edit_buttons(block)
     buttons = []
     nowhere = 'javascript: return false;'
-    if modifiable?(block)
+    if movable?(block)
       if block.first?
         buttons << icon_button('up-disabled', _("Can't move up anymore."), nowhere)
       else
@@ -229,15 +229,15 @@ module BoxesHelper
           buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
         end
       end
+    end
-      if block.editable?
-        buttons << modal_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
-      end
+    if editable?(block)
+      buttons << modal_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+    end
-      if !block.main?
-        buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
-        buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
-      end
+    if movable?(block) && !block.main?
+      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
+      buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
     if block.respond_to?(:help)
@@ -273,7 +273,11 @@ module BoxesHelper
     classes
   end
-  def modifiable?(block)
-    return !block.fixed || environment.admins.include?(user)
+  def movable?(block)
+    return block.movable? || user.is_admin?
+  end
+
+  def editable?(block)
+    return block.editable? || user.is_admin?
   end
 end
 class Block < ActiveRecord::Base
-  attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box, :fixed
+  attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
+                  :visualization_format, :language, :display_user,
+                  :box, :edit_modes, :move_modes
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -110,8 +112,13 @@ class Block &lt; ActiveRecord::Base
   # * <tt>'all'</tt>: the block is always displayed
   settings_items :language, :type => :string, :default => 'all'
-  # The block can be configured to be fixed. Only can be edited by environment admins
-  settings_items :fixed, :type => :boolean, :default => false
+  # The block can be configured to define the edition modes options. Only can be edited by environment admins
+  # It can assume the following values:
+  #
+  # * <tt>'all'</tt>: the block owner has all edit options for this block
+  # * <tt>'none'</tt>: the block owner can't do anything with the block
+  settings_items :edit_modes, :type => :string, :default => 'all'
+  settings_items :move_modes, :type => :string, :default => 'all'
   # returns the description of the block, used when the user sees a list of
   # blocks to choose one to include in the design.
@@ -148,7 +155,11 @@ class Block &lt; ActiveRecord::Base
   # Is this block editable? (Default to <tt>false</tt>)
   def editable?
-    true
+    self.edit_modes == "all"
+  end
+
+  def movable?
+    self.move_modes == "all"
   end
   # must always return false, except on MainBlock clas.
@@ -228,6 +239,21 @@ class Block &lt; ActiveRecord::Base
     }
   end
+  def edit_block_options
+    @edit_options ||= {
+      'all'            => _('Can be modified'),
+      'none'           => _('Cannot be modified')
+    }
+  end
+
+  def move_block_options
+    @move_options ||= {
+      'all'            => _('Can be moved'),
+      'none'           => _('Cannot be moved')
+    }
+  end
+
+
   def duplicate
     duplicated_block = self.dup
     duplicated_block.display = 'never'
@@ -5,12 +5,6 @@
     <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
-    <% if environment.admins.include?(user) %>
-      <div class="fixed_block">
-        <%= labelled_check_box(_("Fixed"), "block[fixed]", value = "1", checked = @block.fixed) %>
-      </div>
-    <% end %>
-
     <%= render :partial => partial_for_class(@block.class) %>
     <div class="display">
@@ -25,6 +19,15 @@
     <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
+    <% if user.is_admin? %>
+      <div class="edit-modes">
+        <%= labelled_form_field _('Edit options:'), select_tag('block[edit_modes]', options_from_collection_for_select(@block.edit_block_options, :first, :last, @block.edit_modes)) %>
+      </div>
+      <div class="move-modes">
+        <%= labelled_form_field _('Move options:'), select_tag('block[move_modes]', options_from_collection_for_select(@block.move_block_options, :first, :last, @block.move_modes)) %>
+      </div>
+    <% end %>
+
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= modal_close_button(_('Cancel')) %>
@@ -56,37 +56,37 @@ Noosfero::Application.routes.draw do
   match 'search(/:action(/*category_path))', :controller => 'search'
   # events
-  match 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/events_by_day', :controller => 'events', :action => 'events_by_day', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events_by_month', :controller => 'events', :action => 'events_by_month', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events/:year/:month/:day', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :day => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events/:year/:month', :controller => 'events', :action => 'events', :year => /\d*/, :month => /\d*/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/events', :controller => 'events', :action => 'events', :profile => /#{Noosfero.identifier_format_in_url}/
   # catalog
-  match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/, :as => :catalog
+  match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/, :as => :catalog
   # invite
-  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format_in_url}/
   # feeds per tag
-  match 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format}/, :as => :tag_feed
+  match 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/, :as => :tag_feed
   # profile tags
-  match 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format}/
-  match 'profile/:profile/tags(/:id)', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'profile/:profile/tags(/:id)', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format_in_url}/
   # profile search
-  match 'profile/:profile/search', :controller => 'profile_search', :action => 'index', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/search', :controller => 'profile_search', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/
   # comments
-  match 'profile/:profile/comment/:action/:id', :controller => 'comment', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/comment/:action/:id', :controller => 'comment', :profile => /#{Noosfero.identifier_format_in_url}/
   # public profile information
-  match 'profile/:profile(/:action(/:id))', :controller => 'profile', :action => 'index', :id => /[^\/]*/, :profile => /#{Noosfero.identifier_format}/, :as => :profile
+  match 'profile/:profile(/:action(/:id))', :controller => 'profile', :action => 'index', :id => /[^\/]*/, :profile => /#{Noosfero.identifier_format_in_url}/, :as => :profile
   # contact
-  match 'contact/:profile/:action(/:id)', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format}/
+  match 'contact/:profile/:action(/:id)', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format_in_url}/
   # map balloon
   match 'map_balloon/:action/:id', :controller => 'map_balloon', :id => /.*/
@@ -98,8 +98,8 @@ Noosfero::Application.routes.draw do
   ## Controllers that are profile-specific (for profile admins )
   ######################################################
   # profile customization - "My profile"
-  match 'myprofile/:profile', :controller => 'profile_editor', :action => 'index', :profile => /#{Noosfero.identifier_format}/
-  match 'myprofile/:profile/:controller(/:action(/:id))', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format}/, :as => :myprofile
+  match 'myprofile/:profile', :controller => 'profile_editor', :action => 'index', :profile => /#{Noosfero.identifier_format_in_url}/
+  match 'myprofile/:profile/:controller(/:action(/:id))', :controller => Noosfero.pattern_for_controllers_in_directory('my_profile'), :profile => /#{Noosfero.identifier_format_in_url}/, :as => :myprofile
   ######################################################
@@ -127,14 +127,14 @@ Noosfero::Application.routes.draw do
   # cache stuff - hack
   match 'public/:action/:id', :controller => 'public'
-  match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
   # match requests for profiles that don't have a custom domain
-  match ':profile(/*page)', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
+  match ':profile(/*page)', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format_in_url}/, :constraints => EnvironmentDomainConstraint.new
   # match requests for content in domains hosted for profiles
   match '/(*page)', :controller => 'content_viewer', :action => 'view_page'
+noosfero (1.1) wheezy; urgency=low
+
+  * Noosfero 1.1 final release
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 04 May 2015 18:47:35 -0300
+
 noosfero (1.1~rc4) wheezy; urgency=medium
   * Fourth release candidate for Noosfero 1.1
@@ -57,6 +57,12 @@ module Noosfero
     '[a-z0-9][a-z0-9~.]*([_\-][a-z0-9~.]+)*'
   end
+  # All valid identifiers, plus ~ meaning "the current user". See
+  # ApplicationController#redirect_to_current_user
+  def self.identifier_format_in_url
+    "(#{identifier_format}|~)"
+  end
+
   def self.default_hostname
     Environment.table_exists? && Environment.default ? Environment.default.default_hostname : 'localhost'
   end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.1~rc4'
+  VERSION = '1.1'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -12,9 +12,8 @@ namespace :noosfero do
       end
     end
     task :unlink_plugins_textiles do
-      root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
-      rm_f Dir.glob(root.join('doc/noosfero/plugins/*.textile')) -
-        [root.join('doc/noosfero/plugins/index.textile')]
+      rm_f Dir.glob('doc/noosfero/plugins/*.textile') -
+        ['doc/noosfero/plugins/index.textile']
     end
     input = Dir.glob('doc/noosfero/**/*.textile') + plugins_textiles.map{|i| "doc/noosfero/plugins/#{File.basename(i)}"}
     topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }.uniq
@@ -4,7 +4,7 @@ targets = []
 templates.each do |template|
   target = template.gsub(/.erb$/, '')
   targets << target
-  file target => [:makemo, template] do
+  file target => [:makemo, template, :environment] do
     require 'erb'
     erb = ERB.new(File.read(template))
     File.open(target, 'w') do |file|
@@ -578,4 +578,22 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_response :success
   end
+  should "redirect to 404 if profile is '~' and user is not logged in" do
+    get :index, :profile => '~'
+    assert_response :missing
+  end
+
+  should "redirect to action when profile is '~' " do
+    login_as('ze')
+    get :index, :profile => '~'
+    assert_response 302
+  end
+
+  should "substitute '~' by current user and redirect properly " do
+    login_as('ze')
+    profile = Profile.where(:identifier => 'ze').first
+    get :index, :profile => '~'
+    assert_redirected_to :controller => 'test', :action => 'index', :profile => profile.identifier
+  end
+
 end
@@ -737,9 +737,9 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     end
   end
-  test 'should forbid POST to save for fixed blocks' do
+  test 'should forbid POST to save for uneditable blocks' do
     block = profile.blocks.last
-    block.fixed = true
+    block.edit_modes = "none"
     block.save!
     post :save, id: block.id, profile: profile.identifier
@@ -748,7 +748,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   test 'should forbid POST to move_block for fixed blocks' do
     block = profile.blocks.last
-    block.fixed = true
+    block.move_modes = "none"
     block.save!
     post :move_block, id: block.id, profile: profile.identifier, target: "end-of-box-#{@box3.id}"
@@ -272,4 +272,8 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/embed/block/12345', :controller => 'embed', :action => 'block', :id => '12345')
   end
+  should 'accept ~ as placeholder for current user' do
+    assert_routing('/profile/~', :controller => 'profile', :profile => '~', :action => 'index')
+  end
+
 end
@@ -35,6 +35,24 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert Block.new.editable?
   end
+  should 'be editable if edit modes is all' do
+    block = Block.new
+    block.edit_modes = 'all'
+
+    assert block.editable?
+  end
+
+  should 'be movable by default' do
+    assert Block.new.movable?
+  end
+
+  should 'be movable if move modes is all' do
+    block = Block.new
+    block.move_modes = 'all'
+
+    assert block.movable?
+  end
+
   should 'have default titles' do
     b = Block.new
     b.expects(:default_title).returns('my title')
@@ -123,24 +123,24 @@ class BoxesHelperTest &lt; ActionView::TestCase
     display_box_content(box, '')
   end
-  should 'not show move options on block when block is fixed' do
+  should 'not show move options on block when block has no permission to edit' do
     p = create_user_with_blocks
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
-    b.fixed = true
+    b.move_modes = "none"
     b.save!
     stubs(:environment).returns(p.environment)
     stubs(:user).returns(p)
-    assert_equal false, modifiable?(b)
+    assert_equal false, movable?(b)
   end
-  should 'show move options on block when block is fixed and user is admin' do
+  should 'show move options on block when block has no permission to edit and user is admin' do
     p = create_user_with_blocks
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
-    b.fixed = true
+    b.edit_modes = "none"
     b.save!
     p.environment.add_admin(p)
@@ -148,7 +148,7 @@ class BoxesHelperTest &lt; ActionView::TestCase
     stubs(:environment).returns(p.environment)
     stubs(:user).returns(p)
-    assert_equal true, modifiable?(b)
+    assert_equal true, movable?(b)
   end
   should 'consider boxes_limit without custom_design' do
@@ -198,4 +198,16 @@ class BoxesHelperTest &lt; ActionView::TestCase
     assert_no_tag_in_string block_edit_buttons(block), :tag => 'a', :attributes => {:class => 'button icon-button icon-embed '}
   end
+  should 'only show edit option on block' do
+    p = create_user_with_blocks
+
+    b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
+    b.edit_modes = "only_edit"
+    b.save!
+
+    stubs(:environment).returns(p.environment)
+    stubs(:user).returns(p)
+
+    assert_equal false, b.editable?
+  end
 end
@@ -554,6 +554,7 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'delay activation check with custom time' do
     NOOSFERO_CONF.stubs(:[]).with('hours_until_user_activation_check').returns(240)
+    NOOSFERO_CONF.stubs(:[]).with('exclude_profile_identifier_pattern')
     user = new_user
     job = Delayed::Job.last
     assert_match /UserActivationJob/, job.handler
	@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base		@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
9	before_filter :allow_cross_domain_access	9	before_filter :allow_cross_domain_access
10	before_filter :login_required, :if => :private_environment?	10	before_filter :login_required, :if => :private_environment?
11	before_filter :verify_members_whitelist, :if => [:private_environment?, :user]	11	before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
		12	+ before_filter :redirect_to_current_user
12		13
13	def verify_members_whitelist	14	def verify_members_whitelist
14	render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)	15	render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)
	@@ -192,4 +193,15 @@ class ApplicationController < ActionController::Base		@@ -192,4 +193,15 @@ class ApplicationController < ActionController::Base
192	def private_environment?	193	def private_environment?
193	@environment.enabled?(:restrict_to_members)	194	@environment.enabled?(:restrict_to_members)
194	end	195	end
		196	+
		197	+ def redirect_to_current_user
		198	+ if params[:profile] == '~'
		199	+ if logged_in?
		200	+ redirect_to params.merge(:profile => user.identifier)
		201	+ else
		202	+ render_not_found
		203	+ end
		204	+ end
		205	+ end
		206	+
195	end	207	end
1	class Block < ActiveRecord::Base	1	class Block < ActiveRecord::Base
2		2
3	- attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box, :fixed	3	+ attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
		4	+ :visualization_format, :language, :display_user,
		5	+ :box, :edit_modes, :move_modes
4		6
5	# to be able to generate HTML	7	# to be able to generate HTML
6	include ActionView::Helpers::UrlHelper	8	include ActionView::Helpers::UrlHelper
	@@ -110,8 +112,13 @@ class Block < ActiveRecord::Base		@@ -110,8 +112,13 @@ class Block < ActiveRecord::Base
110	# * <tt>'all'</tt>: the block is always displayed	112	# * <tt>'all'</tt>: the block is always displayed
111	settings_items :language, :type => :string, :default => 'all'	113	settings_items :language, :type => :string, :default => 'all'
112		114
113	- # The block can be configured to be fixed. Only can be edited by environment admins
114	- settings_items :fixed, :type => :boolean, :default => false	115	+ # The block can be configured to define the edition modes options. Only can be edited by environment admins
		116	+ # It can assume the following values:
		117	+ #
		118	+ # * <tt>'all'</tt>: the block owner has all edit options for this block
		119	+ # * <tt>'none'</tt>: the block owner can't do anything with the block
		120	+ settings_items :edit_modes, :type => :string, :default => 'all'
		121	+ settings_items :move_modes, :type => :string, :default => 'all'
115		122
116	# returns the description of the block, used when the user sees a list of	123	# returns the description of the block, used when the user sees a list of
117	# blocks to choose one to include in the design.	124	# blocks to choose one to include in the design.
	@@ -148,7 +155,11 @@ class Block < ActiveRecord::Base		@@ -148,7 +155,11 @@ class Block < ActiveRecord::Base
148		155
149	# Is this block editable? (Default to <tt>false</tt>)	156	# Is this block editable? (Default to <tt>false</tt>)
150	def editable?	157	def editable?
151	- true	158	+ self.edit_modes == "all"
		159	+ end
		160	+
		161	+ def movable?
		162	+ self.move_modes == "all"
152	end	163	end
153		164
154	# must always return false, except on MainBlock clas.	165	# must always return false, except on MainBlock clas.
	@@ -228,6 +239,21 @@ class Block < ActiveRecord::Base		@@ -228,6 +239,21 @@ class Block < ActiveRecord::Base
228	}	239	}
229	end	240	end
230		241
		242	+ def edit_block_options
		243	+ @edit_options \|\|= {
		244	+ 'all' => _('Can be modified'),
		245	+ 'none' => _('Cannot be modified')
		246	+ }
		247	+ end
		248	+
		249	+ def move_block_options
		250	+ @move_options \|\|= {
		251	+ 'all' => _('Can be moved'),
		252	+ 'none' => _('Cannot be moved')
		253	+ }
		254	+ end
		255	+
		256	+
231	def duplicate	257	def duplicate
232	duplicated_block = self.dup	258	duplicated_block = self.dup
233	duplicated_block.display = 'never'	259	duplicated_block.display = 'never'
		1	+noosfero (1.1) wheezy; urgency=low
		2	+
		3	+ * Noosfero 1.1 final release
		4	+
		5	+ -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 04 May 2015 18:47:35 -0300
		6	+
1	noosfero (1.1~rc4) wheezy; urgency=medium	7	noosfero (1.1~rc4) wheezy; urgency=medium
2		8
3	* Fourth release candidate for Noosfero 1.1	9	* Fourth release candidate for Noosfero 1.1
	@@ -57,6 +57,12 @@ module Noosfero		@@ -57,6 +57,12 @@ module Noosfero
57	'[a-z0-9][a-z0-9~.]([_\-][a-z0-9~.]+)'	57	'[a-z0-9][a-z0-9~.]([_\-][a-z0-9~.]+)'
58	end	58	end
59		59
		60	+ # All valid identifiers, plus ~ meaning "the current user". See
		61	+ # ApplicationController#redirect_to_current_user
		62	+ def self.identifier_format_in_url
		63	+ "(#{identifier_format}\|~)"
		64	+ end
		65	+
60	def self.default_hostname	66	def self.default_hostname
61	Environment.table_exists? && Environment.default ? Environment.default.default_hostname : 'localhost'	67	Environment.table_exists? && Environment.default ? Environment.default.default_hostname : 'localhost'
62	end	68	end
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '1.1~rc4'	3	+ VERSION = '1.1'
4	end	4	end
5		5
6	root = File.expand_path(File.dirname(__FILE__) + '/../..')	6	root = File.expand_path(File.dirname(__FILE__) + '/../..')
	@@ -4,7 +4,7 @@ targets = []		@@ -4,7 +4,7 @@ targets = []
4	templates.each do \|template\|	4	templates.each do \|template\|
5	target = template.gsub(/.erb$/, '')	5	target = template.gsub(/.erb$/, '')
6	targets << target	6	targets << target
7	- file target => [:makemo, template] do	7	+ file target => [:makemo, template, :environment] do
8	require 'erb'	8	require 'erb'
9	erb = ERB.new(File.read(template))	9	erb = ERB.new(File.read(template))
10	File.open(target, 'w') do \|file\|	10	File.open(target, 'w') do \|file\|
	@@ -578,4 +578,22 @@ class ApplicationControllerTest < ActionController::TestCase		@@ -578,4 +578,22 @@ class ApplicationControllerTest < ActionController::TestCase
578	assert_response :success	578	assert_response :success
579	end	579	end
580		580
		581	+ should "redirect to 404 if profile is '~' and user is not logged in" do
		582	+ get :index, :profile => '~'
		583	+ assert_response :missing
		584	+ end
		585	+
		586	+ should "redirect to action when profile is '~' " do
		587	+ login_as('ze')
		588	+ get :index, :profile => '~'
		589	+ assert_response 302
		590	+ end
		591	+
		592	+ should "substitute '~' by current user and redirect properly " do
		593	+ login_as('ze')
		594	+ profile = Profile.where(:identifier => 'ze').first
		595	+ get :index, :profile => '~'
		596	+ assert_redirected_to :controller => 'test', :action => 'index', :profile => profile.identifier
		597	+ end
		598	+
581	end	599	end
	@@ -737,9 +737,9 @@ class ProfileDesignControllerTest < ActionController::TestCase		@@ -737,9 +737,9 @@ class ProfileDesignControllerTest < ActionController::TestCase
737	end	737	end
738	end	738	end
739		739
740	- test 'should forbid POST to save for fixed blocks' do	740	+ test 'should forbid POST to save for uneditable blocks' do
741	block = profile.blocks.last	741	block = profile.blocks.last
742	- block.fixed = true	742	+ block.edit_modes = "none"
743	block.save!	743	block.save!
744		744
745	post :save, id: block.id, profile: profile.identifier	745	post :save, id: block.id, profile: profile.identifier
	@@ -748,7 +748,7 @@ class ProfileDesignControllerTest < ActionController::TestCase		@@ -748,7 +748,7 @@ class ProfileDesignControllerTest < ActionController::TestCase
748		748
749	test 'should forbid POST to move_block for fixed blocks' do	749	test 'should forbid POST to move_block for fixed blocks' do
750	block = profile.blocks.last	750	block = profile.blocks.last
751	- block.fixed = true	751	+ block.move_modes = "none"
752	block.save!	752	block.save!
753		753
754	post :move_block, id: block.id, profile: profile.identifier, target: "end-of-box-#{@box3.id}"	754	post :move_block, id: block.id, profile: profile.identifier, target: "end-of-box-#{@box3.id}"
	@@ -272,4 +272,8 @@ class RoutingTest < ActionController::IntegrationTest		@@ -272,4 +272,8 @@ class RoutingTest < ActionController::IntegrationTest
272	assert_routing('/embed/block/12345', :controller => 'embed', :action => 'block', :id => '12345')	272	assert_routing('/embed/block/12345', :controller => 'embed', :action => 'block', :id => '12345')
273	end	273	end
274		274
		275	+ should 'accept ~ as placeholder for current user' do
		276	+ assert_routing('/profile/~', :controller => 'profile', :profile => '~', :action => 'index')
		277	+ end
		278	+
275	end	279	end
	@@ -35,6 +35,24 @@ class BlockTest < ActiveSupport::TestCase		@@ -35,6 +35,24 @@ class BlockTest < ActiveSupport::TestCase
35	assert Block.new.editable?	35	assert Block.new.editable?
36	end	36	end
37		37
		38	+ should 'be editable if edit modes is all' do
		39	+ block = Block.new
		40	+ block.edit_modes = 'all'
		41	+
		42	+ assert block.editable?
		43	+ end
		44	+
		45	+ should 'be movable by default' do
		46	+ assert Block.new.movable?
		47	+ end
		48	+
		49	+ should 'be movable if move modes is all' do
		50	+ block = Block.new
		51	+ block.move_modes = 'all'
		52	+
		53	+ assert block.movable?
		54	+ end
		55	+
38	should 'have default titles' do	56	should 'have default titles' do
39	b = Block.new	57	b = Block.new
40	b.expects(:default_title).returns('my title')	58	b.expects(:default_title).returns('my title')