@@ -11,7 +11,7 @@ class AccountsController < ApplicationController @account = Account.new(params[:account]) if @account.save flash[:success] = "Votre compte a été créé. Vous allez recevoir un email avec les informations pour l'activer" - AccountNotifications.deliver_signup(@account) # TODO run_later + AccountNotifications.deliver_signup(@account) redirect_to '/' else render :new @@ -37,7 +37,7 @@ class AccountsController < ApplicationController if @account flash[:success] = "Vous allez recevoir un email avec un lien pour changer votre mot de passe" @account.reset_perishable_token! - AccountNotifications.deliver_forgot_password(@account) # TODO run_later + AccountNotifications.deliver_forgot_password(@account) redirect_to '/' else flash[:error] = "Désolé, ce login ne correspond à aucun compte actif" app/controllers/accounts_controller.rb @@ -31,7 +31,7 @@ class WikiPagesController < ApplicationController @wiki_page.user_id = current_user.id @wiki_page.attributes = params[:wiki_page] if !preview_mode && @wiki_page.save - @wiki_page.create_node(:user_id => current_user.id) + @wiki_page.create_node(:user_id => current_user.id, :cc_licensed => true) flash[:success] = "Nouvelle page de wiki créée" redirect_to @wiki_page else app/controllers/wiki_pages_controller.rb @@ -52,7 +52,6 @@ class Account < ActiveRecord::Base ### Password ### before_validation_on_create :generate_a_password - def generate_a_password chars = [*'A'..'Z'] + [*'a'..'z'] + [*'1'..'9'] + %w(- + ! ? : £ $ % &) pass = (0..7).map { chars.rand }.join app/models/account.rb @@ -64,7 +64,6 @@ class Comment < ActiveRecord::Base MAX_DEPTH = 1022 / PATH_SIZE after_create :generate_materialized_path - def generate_materialized_path parent = Comment.find(parent_id) if parent_id.present? parent_path = parent ? parent.materialized_path : '' @@ -101,7 +100,6 @@ class Comment < ActiveRecord::Base ### Calculations ### before_create :default_score - def default_score self.score = Math.log10(user.account.karma).to_i - 1 end app/models/comment.rb @@ -12,6 +12,17 @@ class Content < ActiveRecord::Base named_scope :sorted, :order => 'created_at DESC' delegate :score, :user_id, :to => :node +### License ### + + attr_accessor :cc_licensed + attr_accessible :cc_licensed + + def create_node_with_license(attrs={}, replace_existing=true) + attrs[:cc_licensed] = true if cc_licensed && cc_licensed != '0' + create_node_without_license attrs, replace_existing + end + alias_method_chain :create_node, :license + ### ACL ### def readable_by?(user) app/models/content.rb @@ -9,6 +9,7 @@ # interest :integer(4) default(0) # user_id :integer(4) # public :boolean(1) default(TRUE) +# cc_licensed :boolean(1) # comments_count :integer(4) default(0) # last_commented_at :datetime # created_at :datetime @@ -37,7 +38,6 @@ class Node < ActiveRecord::Base ### Interest ### after_create :compute_interest - def compute_interest coeff = content_type.constantize.interest_coefficient stmt = "UPDATE nodes SET interest=(score * #{coeff} + UNIX_TIMESTAMP(created_at) / 1000) WHERE id=#{self.id}" app/models/node.rb @@ -20,7 +20,6 @@ class WikiVersion < ActiveRecord::Base ### Append-only ### before_update :raise_on_update - def raise_on_update raise ActiveRecordError.new "On ne modifie pas les anciennes versions !" end app/models/wiki_version.rb @@ -7,5 +7,8 @@ = form.label :body, "Journal complet" = form.text_area :body, :required => 'required', :spellcheck => 'true', :class => 'markItUp' %p + = form.check_box :cc_licensed + = form.label :cc_licensed, 'Je place ce document sous licence Creative Commons Paternité-Partage des Conditions Initiales à l\'Identique 3.0 (<a href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">licence CC by-sa</a>)'.html_safe! +%p = form.submit "Prévisualiser" = form.submit "Poster le journal" if @preview_mode app/views/diaries/_form.html.haml @@ -27,6 +27,9 @@ = form.label :second_part, "Seconde partie" = form.text_area :second_part, :spellcheck => 'true', :class => 'markItUp' %p + = form.check_box :cc_licensed + = form.label :cc_licensed, 'Je place ce document sous licence Creative Commons Paternité-Partage des Conditions Initiales à l\'Identique 3.0 (<a href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">licence CC by-sa</a>)'.html_safe! +%p = form.label :message, "Si vous le souhaitez, vous pouvez laisser un message à l'équipe de modération" <br/> = form.text_area :message, :spellcheck => 'true' app/views/news/_form.html.haml @@ -4,6 +4,8 @@ = title .meta = meta + - if record.node.cc_licensed? + = link_to "Licence CC by-sa", 'http://creativecommons.org/licenses/by-sa/3.0/deed.fr' Tags : %ul.tag-cloud - record.node.popular_tags.each do |tag| app/views/nodes/_content.html.haml @@ -6,6 +6,7 @@ class CreateNodes < ActiveRecord::Migration t.integer :interest, :default => 0 t.references :user t.boolean :public, :default => true + t.boolean :cc_licensed, :default => false t.integer :comments_count, :default => 0 t.datetime :last_commented_at t.timestamps db/migrate/20090105234709_create_nodes.rb @@ -9,6 +9,7 @@ # interest :integer(4) default(0) # user_id :integer(4) # public :boolean(1) default(TRUE) +# cc_licensed :boolean(1) # comments_count :integer(4) default(0) # last_commented_at :datetime # created_at :datetime test/unit/node_test.rb e4dfe15c5d4885ed8b91c2976b5c2699bb4a73c8 Bruno Michel bmichel@menfin.info http://github.com/nono/linuxfr.org/commit/99678cf83e18a1743043edf09ec1b7d24c927b09 99678cf83e18a1743043edf09ec1b7d24c927b09 2009-11-16T16:30:30-08:00 2009-11-16T16:30:30-08:00 Added cc_licensed field on nodes 2b889ea1ab412bfe37d9d51ed25b6d3935ea488a Bruno Michel bmichel@menfin.info