Changeset 1128

Show
Ignore:
Timestamp:
08/19/07 11:23:24 (1 year ago)
Author:
alban
Message:

remove Subscriber class

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/subscriptions_controller.rb

    r1126 r1128  
    77 
    88        def manage 
    9                 @pages = Paginator.new(self, Subscriber.find(session[:user]).subscriptions.size, 4, params[:page]) 
    10                 @subscription = Subscriber.find(session[:user]).subscriptions.find(:all, :limit => @pages.items_per_page, :offset => @pages.current.offset) 
     9                @pages = Paginator.new(self, User.find(session[:user]).subscriptions.size, 4, params[:page]) 
     10                @subscription = User.find(session[:user]).subscriptions.find(:all, :limit => @pages.items_per_page, :offset => @pages.current.offset) 
    1111        end  
    1212   
    1313  def show 
    14         @subscription = Subscriber.find(session[:user]).subscriptions.find(params[:id]) 
     14        @subscription = User.find(session[:user]).subscriptions.find(params[:id]) 
    1515        @review = Review.new(params[:review]) 
    1616        if request.post? 
    …… 
    3232        subscription.author = User.find(session[:user]) 
    3333        subscription.document = subscription.author.documents.find(params[:document]) 
    34         subscription.subscriber = Subscriber.find(params[:id].split("_")[1]) 
     34        subscription.subscriber = User.find(params[:id].split("_")[1]) 
    3535    end 
    3636                @subscription.save 
    …… 
    4545   
    4646  def tag 
    47         @pages = Paginator.new(self, Subscriber.find(session[:user]).subscriptions.find_by_tag(params[:name]).size, 4, params[:page]) 
    48         @subscriptions = Subscriber.find(session[:user]).subscriptions.find_by_tag(params[:name], { :offset => @pages.current.offset, :limit => @pages.items_per_page }) 
     47        @pages = Paginator.new(self, User.find(session[:user]).subscriptions.find_by_tag(params[:name]).size, 4, params[:page]) 
     48        @subscriptions = User.find(session[:user]).subscriptions.find_by_tag(params[:name], { :offset => @pages.current.offset, :limit => @pages.items_per_page }) 
    4949  end 
    5050   
    5151  def download 
    52     @subscription = Subscriber.find(session[:user]).subscriptions.find(params[:id]) 
     52    @subscription = User.find(session[:user]).subscriptions.find(params[:id]) 
    5353    @subscription.increment!(:download_count) 
    5454        send_file @subscription.document.path, :type => @subscription.document.format, :filename => @subscription.document.filename 

  • trunk/app/controllers/users_controller.rb

    r1126 r1128  
    1414        def dashboard 
    1515                @author = User.find(session[:user]) 
    16                 @subscriber = Subscriber.find(session[:user]) 
     16                @subscriber = User.find(session[:user]) 
    1717                user_tags = @author.documents.collect{ |d| d.tags } 
    1818                @tag = @subscriber.subscriptions.collect{ |s| s.document.tags } + user_tags 
    …… 
    2222        def tags 
    2323          @author = User.find(session[:user]) 
    24                 @subscriber = Subscriber.find(session[:user]) 
     24                @subscriber = User.find(session[:user]) 
    2525          @tag = @subscriber.subscriptions.collect{ |s| s.document.tags } + @author.documents.collect{ |d| d.tags } 
    2626                @tag = @tag.flatten.uniq 
    …… 
    2929        def tag 
    3030                @document = User.find(session[:user]).documents.find_by_tag(params[:name], { :limit => 5 }) 
    31                 @subscription = Subscriber.find(session[:user]).subscriptions.find_by_tag(params[:name], { :limit => 5 }) 
     31                @subscription = User.find(session[:user]).subscriptions.find_by_tag(params[:name], { :limit => 5 }) 
    3232        end 
    3333         
    3434        def find 
    3535                @document = User.find(session[:user]).documents.find_by_keywords(params[:keywords]) 
    36                 @subscription = Subscriber.find(session[:user]).subscriptions.find_by_keywords(params[:keywords]) 
     36                @subscription = User.find(session[:user]).subscriptions.find_by_keywords(params[:keywords]) 
    3737        end 
    3838         
    …… 
    8585                 
    8686                begin 
    87                 Subscriber.find(@user.id).subscriptions.build(:author => User.find(1), :document => Document.find(1)).save 
     87                User.find(@user.id).subscriptions.build(:author => User.find(1), :document => Document.find(1)).save 
    8888          rescue ActiveRecord::RecordNotFound 
    8989            logger.error("no welcome document found") 

  • trunk/app/models/user.rb

    r1126 r1128  
    1313        end 
    1414         
    15         has_many :subscriptions, :dependent => :destroy, :order => "created_at DESC" do  
     15        has_many :subscriptions, :dependent => :destroy, :order => "created_at DESC", :foreign_key => "subscriber_id" do  
    1616                def find_by_tag(name, options = Hash.new) 
    1717                  options[:offset] = 0 if options[:offset] 

  • trunk/app/views/documents/share.rhtml

    r1119 r1128  
    3636<h4>Ont accÚs à ce document :</h4> 
    3737<ul id="subscribers"> 
    38  <%= render :partial => "subscribers/subscribers", :object => @document.subscribers, :locals => { :empty => "Déposer ici les utilisateurs qui ont accÚs à ce document", :draggable => true } %> 
     38 <%= render :partial => "users/subscribers", :object => @document.subscribers, :locals => { :empty => "Déposer ici les utilisateurs qui ont accÚs à ce document", :draggable => true } %> 
    3939</ul> 
    4040<%= drop_receiving_element("subscribers", :url => { :controller => "subscriptions", :action => "add", :document => @document }) %> 

  • trunk/app/views/subscriptions/update.rjs

    r792 r1128  
    11page.replace_html "users", :partial => "users/users", :object => @subscription.document.nonsubscribers, :locals => { :empty => "Déposer ici les utilisateurs qui n'ont pas accÚs à ce document", :draggable => true } 
    2 page.replace_html "subscribers", :partial => "subscribers/subscribers", :object => @subscription.document.subscribers, :locals => { :empty => "Déposer ici les utilisateurs qui ont accÚs à ce document", :draggable => true } 
     2page.replace_html "subscribers", :partial => "users/subscribers", :object => @subscription.document.subscribers, :locals => { :empty => "Déposer ici les utilisateurs qui ont accÚs à ce document", :draggable => true }