public/avatars/original/missing.png @@ -8,8 +8,9 @@ class ProjectsController < ApplicationController respond_to do |format| format.html # index.html.erb format.xml { render :xml => @projects } - format.fxml { render :fxml => @projects.to_fxml(:include => - {:sprints => {:include => {:tasks => {:methods => + format.fxml { render :fxml => @projects.to_fxml(:root => Project.to_s.underscore.pluralize, + :include => {:sprints => {:root => Sprint.to_s.underscore.pluralize, + :include => {:tasks => {:root => Task.to_s.underscore.pluralize, :methods => [:total_time, :total_time_today, :total_time_this_week, :total_time_this_month]}}}}) } end end app/controllers/projects_controller.rb @@ -62,7 +62,7 @@ } private function chooseFile():void { - photo = new RubossFileReference; + photo = new RubossFileReference("avatar"); photo.addEventListener(IOErrorEvent.IO_ERROR, ioErrorHandler, false, 0, true); photo.addEventListener(Event.SELECT, selectFile, false, 0, true); photo.addEventListener(Event.CANCEL, cancelBrowse, false, 0, true); app/flex/pomodo/components/login/LoginScreen.mxml @@ -22,18 +22,20 @@ class Account < ActiveRecord::Base validates_format_of :email, :with => Authentication.email_regex, :message => Authentication.bad_email_message has_one :user + + has_attached_file :avatar, :styles => {:thumb => '100x100>'} # doesn't resize for some reason, check! - has_attachment :content_type => :image, - :storage => :file_system, - :resize_to => '100x100>', - :path_prefix => 'public/images/accounts' + # has_attachment :content_type => :image, + # :storage => :file_system, + # :resize_to => '100x100>', + # :path_prefix => 'public/images/accounts' cattr_accessor :current_account, :session_token # HACK HACK HACK -- how to do attr_accessible from here? # prevents a user from submitting a crafted form that bypasses activation # anything else you want your user to change should be added here. - attr_accessible :login, :email, :name, :password, :password_confirmation, :uploaded_data, :session_token + attr_accessible :login, :email, :name, :password, :password_confirmation, :session_token, :avatar #:uploaded_data # Authenticates a user by their login name and unencrypted password. Returns the user or nil. # @@ -61,7 +63,8 @@ class Account < ActiveRecord::Base def photo_url begin - public_filename + #public_filename + avatar.url(:original) rescue DEFAULT_PHOTO_URL end app/models/account.rb @@ -16,13 +16,19 @@ class CreateAccounts < ActiveRecord::Migration t.column :deleted_at, :datetime # For attachment_fu - t.column :parent_id, :integer - t.column :content_type, :string - t.column :filename, :string - t.column :thumbnail, :string - t.column :size, :integer - t.column :width, :integer - t.column :height, :integer + # t.column :parent_id, :integer + # t.column :content_type, :string + # t.column :filename, :string + # t.column :thumbnail, :string + # t.column :size, :integer + # t.column :width, :integer + # t.column :height, :integer + + # For paperclip + t.column :avatar_file_name, :string + t.column :avatar_content_type, :string + t.column :avatar_file_size, :integer + t.column :avatar_updated_at, :datetime end add_index :accounts, :login, :unique => true end db/migrate/20081006235620_create_accounts.rb @@ -25,13 +25,10 @@ ActiveRecord::Schema.define(:version => 20081014021011) do t.datetime "activated_at" t.string "state", :default => "passive" t.datetime "deleted_at" - t.integer "parent_id" - t.string "content_type" - t.string "filename" - t.string "thumbnail" - t.integer "size" - t.integer "width" - t.integer "height" + t.string "avatar_file_name" + t.string "avatar_content_type" + t.integer "avatar_file_size" + t.datetime "avatar_updated_at" end add_index "accounts", ["login"], :name => "index_accounts_on_login", :unique => true db/schema.rb public/bin/Pomodo.swf @@ -22,7 +22,7 @@ dima: activation_code: 1b6453892473a467d07372d45eb05abc2031647a activated_at: state: active - attachment_file: test/images/dima.png + #attachment_file: test/images/dima.png peter: login: peter @@ -46,5 +46,4 @@ aaron: remember_token: activation_code: 1b6453892473a467d07372d45eb05abc2031647a activated_at: - state: active test/fixtures/accounts.yml public/bin/assets/Knob Valid Blue.png public/bin/assets/Knob Valid Green.png public/bin/assets/story_editor_icon.png 45134ccd9b2845aea926567f5059ce03db1453e8 Dima Berastau dima@ruboss.com http://github.com/dima/pomodo_on_rails/commit/54e29bc44839157d86e643afaa26196beeb8ea04 54e29bc44839157d86e643afaa26196beeb8ea04 2008-12-13T12:21:03-08:00 2008-12-13T12:21:03-08:00 Switched to paperclip instead of attachment_fu. Made sure project controller specified :root option (it can return empty result sets). 9c772a5598aeb164548dd51f9d79c3b0d5db6127 Dima Berastau dima@ruboss.com