muck-profiles 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/muck/profiles_controller.rb

@@ -1,55 +1,15 @@
 class Muck::ProfilesController < ApplicationController
   unloadable
 
-  before_filter :search_results, :only => [:index, :search]
-
-  def index
-    respond_to do |format|
-      format.html { render :template => 'profiles/index' }
-    end
-  end
-
-  def search
-    respond_to do |format|
-      format.html { render :template => 'profiles/index' }
-    end
-  end
-
   # show a given user's public profile information
   def show
-    @user = User.find(params[:id])
+    @user = User.find_by_login(params[:id])
     respond_to do |format|
-      format.html { render :template => 'profiles/show' }
+      format.html do
+        render :template => 'profiles/show'
+      end
     end
-  end
 
-  def edit
   end
   
-  private
-
-  def search_results
-    @query = params[:q]
-    @per_page = 20
-    @browse = @query ? 'search' : params[:browse] || 'date' 
-
-    #      field_list = logged_in? ? 'protected_profile AS profile' : 'public_profile AS profile'
-    #      field_list = 'public_profile AS profile'
-    field_list = '*'
-
-    @query = nil if (@query == '*') 
-
-    if !@query.nil?
-      @results = User.find_by_solr("#{search_field}:(#{@query})", :offset => (@page-1)*@per_page, :limit => @per_page).results
-
-    elsif @browse == 'alpha'
-      @alpha_index = params[:alpha_index] || 'A'
-      @results = User.find(:all, :select => field_list, :conditions => ["last_name LIKE ?", @alpha_index + '%'], :order => 'last_name, first_name').paginate(:page => @page, :per_page => @per_page)
-
-    else
-      @results = User.find(:all, :select => field_list, :order => 'created_at DESC').paginate(:page => @page, :per_page => @per_page)
-    end
-    flash[:notice] = @results.empty? ? _('No profiles were found that matched your search.') : nil
-  end
-
 end

data/app/views/profiles/edit.html.erb

@@ -1,16 +0,0 @@
-<div id="edit-user" class="common-form">
-  <h1><%= t('muck.users.update_user') %></h1>
-
-  <% custom_form_for @profile, :url => profile_path(@profile), :html => {:id => "edit-profile-form", :name => 'edit-profile-form', :method => :put, :multipart => true } do |f| -%>
-
-   <%= output_errors(t('muck.profiles.problem_editing_account'), {:class => 'help-box'}, @profile) %>
-
-    <%= image_tag @profile.photo.url(:thumb) %>
-    <%= f.file_field :photo, { :label => t('muck.profiles.upload_photo') } %>
-		<div class="button form-row">
-	  	<%= f.submit t('muck.general.save') %>
-	  </div>
-	  <%= hidden_field_tag :redirect_to, edit_profile_path(@profiles) %>
-	<% end %>
-	
-</div>

data/app/views/profiles/show.html.erb

@@ -0,0 +1,5 @@
+<div class="span-24 colborder column">
+  <%= icon @user, :thumb %>
+  <p><%= @user.full_name %></p>
+  <p><%= link_to t('muck.profiles.edit_profile'), edit_user_profile_path(@user) if @profile.can_edit?(current_user) %></p>
+</div>

data/lib/active_record/acts/muck_profile.rb

@@ -41,8 +41,12 @@ module ActiveRecord
         #   rss_link = RssMethods::auto_detect_rss_url(uri)
         #   write_attribute(:blog_rss, rss_link) if rss_link
         # end
-
-
+        
+        def can_edit?(user)
+          return false if user.nil?
+          self.user_id == user.id || user.admin?
+        end
+        
       end
 
     end

data/locales/en.yml

@@ -2,4 +2,10 @@ en:
   muck:
     profiles:
       upload_photo: "Upload a photo:"
-      problem_editing_account: "There was a problem updating your profile"
+      problem_editing_account: "There was a problem updating your profile"
+      edit_profile: "Edit Profile"
+      update_profile: "Update Profile"
+      edit_success: "Successfully updated your profile"
+      edit_failure: "An error occured while updating your profile."
+      could_not_find_user: "Could not find the specified user."
+      

data/muck-profiles.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-profiles}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-06-19}
+  s.date = %q{2009-06-24}
   s.description = %q{Profile engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -47,40 +47,72 @@ Gem::Specification.new do |s|
      "lib/muck_profiles/tasks.rb",
      "lib/muck_profiles/tasks.rb",
      "locales/ar.yml",
+     "locales/ar.yml",
+     "locales/bg.yml",
      "locales/bg.yml",
      "locales/ca.yml",
+     "locales/ca.yml",
+     "locales/cs.yml",
      "locales/cs.yml",
      "locales/da.yml",
+     "locales/da.yml",
+     "locales/de.yml",
      "locales/de.yml",
      "locales/el.yml",
+     "locales/el.yml",
      "locales/en.yml",
      "locales/en.yml",
      "locales/es.yml",
+     "locales/es.yml",
      "locales/fr.yml",
+     "locales/fr.yml",
+     "locales/it.yml",
      "locales/it.yml",
      "locales/iw.yml",
+     "locales/iw.yml",
+     "locales/ja.yml",
      "locales/ja.yml",
      "locales/ko.yml",
+     "locales/ko.yml",
+     "locales/lt.yml",
      "locales/lt.yml",
      "locales/lv.yml",
+     "locales/lv.yml",
+     "locales/nl.yml",
      "locales/nl.yml",
      "locales/no.yml",
+     "locales/no.yml",
+     "locales/pl.yml",
      "locales/pl.yml",
      "locales/pt.yml",
+     "locales/pt.yml",
+     "locales/ro.yml",
      "locales/ro.yml",
      "locales/ru.yml",
+     "locales/ru.yml",
+     "locales/sk.yml",
      "locales/sk.yml",
      "locales/sl.yml",
+     "locales/sl.yml",
+     "locales/sr.yml",
      "locales/sr.yml",
      "locales/sv.yml",
+     "locales/sv.yml",
+     "locales/tl.yml",
      "locales/tl.yml",
      "locales/uk.yml",
+     "locales/uk.yml",
+     "locales/vi.yml",
      "locales/vi.yml",
      "locales/zh-CN.yml",
+     "locales/zh-CN.yml",
+     "locales/zh-TW.yml",
      "locales/zh-TW.yml",
      "locales/zh.yml",
+     "locales/zh.yml",
      "muck-profiles.gemspec",
      "pkg/muck-profiles-0.1.0.gem",
+     "pkg/muck-profiles-0.1.1.gem",
      "rails/init.rb",
      "rails/init.rb",
      "rdoc/classes/ActionController.html",

data/rdoc/created.rid

@@ -1 +1 @@
-Thu, 18 Jun 2009 15:22:17 -0600
+Fri, 19 Jun 2009 02:11:05 -0600

data/test/rails_root/app/controllers/application_controller.rb

@@ -3,10 +3,12 @@ class ApplicationController < ActionController::Base
   helper :all
   protect_from_forgery
 
-  # called by Admin::Muck::BaseController to check whether or not the
-  # user should have access to the admin UI
-  def admin_access?
-    admin?
-  end
+  protected
+
+    # called by Admin::Muck::BaseController to check whether or not the
+    # user should have access to the admin UI
+    def admin_access?
+      admin?
+    end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-profiles
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -06:00
+date: 2009-06-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - locales/zh.yml
 - muck-profiles.gemspec
 - pkg/muck-profiles-0.1.0.gem
+- pkg/muck-profiles-0.1.1.gem
 - rails/init.rb
 - rdoc/classes/ActionController.html
 - rdoc/classes/ActionController/Routing.html