muck-contents 3.1.5 → 3.1.6

data/VERSION

@@ -1 +1 @@
-3.1.5
+3.1.6

data/app/controllers/admin/muck/contents_controller.rb

@@ -1,9 +1,32 @@
 class Admin::Muck::ContentsController < Admin::Muck::BaseController
   
   def index
-    @contents = Content.by_title.by_newest
     respond_to do |format|
-      format.html { render :template => 'admin/contents/index' }
+      format.html do
+        @contents = Content.by_title.by_newest.paginate(:page => @page, :per_page => @per_page)
+        render :template => 'admin/contents/index' 
+      end
+      format.json do
+        @contents = Content.by_title.by_newest.where("title like ?", params[:term] + '%').paginate(:page => @page, :per_page => @per_page)
+        render :json => @contents
+      end
+    end
+  end
+  
+  def destroy
+    @content = Content.find(params[:id])
+    @content.destroy
+    respond_to do |format|
+      format.html do
+        flash[:notice] = t('muck.contents.content_removed')
+        redirect_to admin_contents_path
+      end
+      format.js do
+        render(:update) do |page|
+          page << "jQuery('##{@content.dom_id}').fadeOut();"
+        end
+      end
+      format.json { render :json => { :success => true, :message => t("muck.contents.content_removed"), :content_id => @content.id } }
     end
   end
   

data/app/controllers/muck/contents_controller.rb

@@ -52,7 +52,7 @@ class Muck::ContentsController < ApplicationController
       end
     else
       # TODO think about caching this:
-      @content = Content.find('404-page-not-found', :scope => MuckContents::GLOBAL_SCOPE) rescue nil
+      @content = Content.find('404-page-not-found', :include => :slugs, :conditions => {:slugs => {:scope => MuckContents::GLOBAL_SCOPE}}) rescue nil
       if @content.blank?
         @content = Content.new(:title => I18n.t('muck.contents.default_404_title'), :body_raw => I18n.t('muck.contents.default_404_body'), :locale => I18n.locale.to_s)
         @content.uri = '/404-page-not-found'

data/app/views/admin/contents/_content.erb

@@ -1,6 +1,7 @@
 <li id="<%=content.dom_id%>" class="contentContainer delete-container">
 	<span class="link"><a href="<%=content.uri%>" target="_blank"><%= content.title %></a></span>
 	<span class="content-controls">
-		<%= render :partial => 'contents/admin', :locals => {:content => content} %>
+	  <%= link_to t('muck.contents.edit'), edit_content_path(content.id), :title => t('muck.contents.edit_title'), :class => 'admin-content' -%> | 
+    <%= link_to t('muck.contents.delete'), admin_content_path(content.id), :title => t('muck.contents.confirm_delete_content'), :class => 'admin-content ajax-delete' -%>
 	</span>
 </li>

data/app/views/admin/contents/index.html.erb

@@ -13,15 +13,35 @@
 <% content_for :javascript do -%>
 <script type="text/javascript" language="JavaScript">
 jQuery(document).ready(function() {
-  var data = <%= @contents.collect{|content| { :title => content.title, :id => content.id } }.to_json.html_safe %>;
-  jQuery("#auto-search").autocomplete(data, {
-    minChars: 0,
-    autoFill: true,
-    mustMatch: false,
-    formatItem: function(item) {
-      return item.title;
-    }
-  }).result(function(event, item) { location.href = '/contents/' + item.id + '/edit'; });
+  var cache = {};
+  var lastXhr;
+  jQuery("#auto-search").autocomplete({
+		source: function(request, response){
+			var term = request.term;
+			if(term in cache){
+				response(cache[term]);
+				return;
+			}
+			lastXhr = jQuery.getJSON("<%=admin_contents_path(:format => 'json')%>", request, function(data, status, xhr){
+			  var reduced_data = jQuery.map(data, function(item){
+					return {
+						label: item.title,
+						value: item.id
+					}
+				});
+				cache[term] = reduced_data;
+				if(xhr === lastXhr){
+					response(reduced_data);
+				}
+			});
+		},
+		minLength: 2,
+		select: function(event, ui) {
+		  if(ui.item){
+		    location.href = '/contents/' + ui.item.value + '/edit';
+		  }
+		}
+	});
 });
 </script>
 <% end -%>

data/muck-contents.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "3.1.5"
+  s.version = "3.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2011-03-19}
+  s.date = %q{2011-03-30}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -06:00
+date: 2011-03-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency