Commit e03073250c7cf12a4570a41b5700ac7f74ebfd54 to sintaxi's pmpknpi

sintaxi / pmpknpi

Description:	A RESTful Blog API written in Merb
Homepage:	http://pmpknpi.com/
Clone URL:	git://github.com/sintaxi/pmpknpi.git Give this clone URL to anyone. `git clone git://github.com/sintaxi/pmpknpi.git`

fixed voting bug

sintaxi (author)

Fri Apr 11 11:49:57 -0700 2008

commit e03073250c7cf12a4570a41b5700ac7f74ebfd54
tree e25b399e4e22ec2168e63ef7bfd5f0e20da44b59
parent 7048191d760906feaa8b49c7972acf2f7a9d8b53

app/controllers/comments.rb
app/views/comments/update.js.erb
app/views/layout/admin.html.erb
app/views/layout/application.html.erb
public/javascripts/jquery-1.2.3.pack.js
schema/development_structure.sql

app/controllers/comments.rb

0
@@ -1,8 +1,8 @@
0
 class Comments < Application
0
   provides :xml, :js, :yaml
0
   
0
-  before :login_required
0
-  before :layout, :exclude => :update
0
+  before :login_required, :only => ['index']
0
+  before :layout, :only => [:index]
0
   
0
   def index
0
     @comments = Comment.find(:all, :include => :article)
0
@@ -30,7 +30,7 @@ class Comments < Application
0
     if content_type == :html
0
       redirect "/articles/#{@article.to_param}"
0
     else
0
-      display :layout => false
0
+      render :template => "comments/update.js", :layout => false
0
     end
0
   end
0

app/views/comments/update.js.erb

...
1
2
3
4

...
 
 
1
2

0
@@ -1,3 +1 @@
0
-<% puts @comment.inspect %>
0
-
0
 $("#comment_<%= @comment.id %>").replaceWith(<%= (partial "comments/comment", :with => @comment, :format => :html).to_json %>);
0
\ No newline at end of file

app/views/layout/admin.html.erb

0
@@ -7,7 +7,9 @@
0
     <link rel="stylesheet" href="/stylesheets/admin.css" type="text/css" media="screen" charset="utf-8">
0
     <link rel="stylesheet" href="/stylesheets/forms.css" type="text/css" media="screen" charset="utf-8">
0
     <link rel="stylesheet" href="/stylesheets/coderay.css" type="text/css" media="screen" charset="utf-8">
0
-    <script type="text/javascript" src="/javascripts/jquery-1.2.1.pack.js"></script>
0
+    <script type="text/javascript" src="/javascripts/jquery-1.2.3.pack.js"></script>
0
+    <script type="text/javascript" src="/javascripts/jquery.form.js"></script>
0
+    <script type="text/javascript" src="/javascripts/simplevalidate.js"></script>
0
     <script type="text/javascript" src="/javascripts/application.js"></script>
0
   </head>
0
   <body>

app/views/layout/application.html.erb

0
@@ -11,10 +11,10 @@
0
     <link rel="stylesheet" href="/stylesheets/application.css" type="text/css" media="screen" charset="utf-8" />
0
     <link rel="stylesheet" href="/stylesheets/forms.css" type="text/css" media="screen" charset="utf-8" />
0
     <link rel="stylesheet" href="/stylesheets/coderay.css" type="text/css" media="screen" charset="utf-8" />
0
-    <script type="text/javascript" src="/javascripts/jquery-1.2.1.pack.js"></script>
0
+    <script type="text/javascript" src="/javascripts/jquery-1.2.3.pack.js"></script>
0
     <script type="text/javascript" src="/javascripts/jquery.form.js"></script>
0
-    <script type="text/javascript" src="/javascripts/application.js"></script>
0
     <script type="text/javascript" src="/javascripts/simplevalidate.js"></script>
0
+    <script type="text/javascript" src="/javascripts/application.js"></script>
0
   </head>
0
   <body>
0
     <div id="wrap">

schema/development_structure.sql

0
@@ -1,11 +1,12 @@
0
 CREATE TABLE articles ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) DEFAULT NULL, "permalink" varchar(255) DEFAULT NULL, "comments_count" integer DEFAULT 0, "commenting" integer DEFAULT 0, "excerpt" text DEFAULT NULL, "body" text DEFAULT NULL, "excerpt_html" text DEFAULT NULL, "body_html" text DEFAULT NULL, "filter" varchar(255) DEFAULT NULL, "published_at" datetime DEFAULT NULL, "created_at" datetime DEFAULT NULL, "updated_at" datetime DEFAULT NULL);
0
-CREATE TABLE assets ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "filename" varchar(255) DEFAULT NULL, "width" integer DEFAULT NULL, "height" integer DEFAULT NULL, "content_type" varchar(255) DEFAULT NULL, "size" integer DEFAULT NULL, "attachable_type" varchar(255) DEFAULT NULL, "attachable_id" integer DEFAULT NULL, "updated_at" datetime DEFAULT NULL, "created_at" datetime DEFAULT NULL, "thumbnail" varchar(255) DEFAULT NULL, "parent_id" integer DEFAULT NULL);
0
-CREATE TABLE comments ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "article_id" integer DEFAULT NULL, "user_ip" varchar(255) DEFAULT NULL, "user_agent" varchar(255) DEFAULT NULL, "referrer" varchar(255) DEFAULT NULL, "approved" boolean DEFAULT 'f', "name" varchar(255) DEFAULT NULL, "email" varchar(255) DEFAULT NULL, "website" varchar(255) DEFAULT NULL, "yay" text DEFAULT '', "nay" text DEFAULT '', "vote_count" integer DEFAULT 1, "body" text DEFAULT NULL, "body_html" text DEFAULT NULL, "created_at" datetime DEFAULT NULL, "updated_at" datetime DEFAULT NULL);
0
+CREATE TABLE assets ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "filename" varchar(255) DEFAULT NULL, "width" integer DEFAULT NULL, "height" integer DEFAULT NULL, "content_type" varchar(255) DEFAULT NULL, "size" integer DEFAULT NULL, "attachable_type" varchar(255) DEFAULT NULL, "attachable_id" integer DEFAULT NULL, "thumbnail" varchar(255) DEFAULT NULL, "parent_id" integer DEFAULT NULL, "created_at" datetime DEFAULT NULL, "updated_at" datetime DEFAULT NULL);
0
+CREATE TABLE comments ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "article_id" integer DEFAULT NULL, "admin" boolean DEFAULT 'f', "user_ip" varchar(255) DEFAULT NULL, "user_agent" varchar(255) DEFAULT NULL, "referrer" varchar(255) DEFAULT NULL, "approved" boolean DEFAULT 'f', "name" varchar(255) DEFAULT NULL, "email" varchar(255) DEFAULT NULL, "website" varchar(255) DEFAULT NULL, "yay" text DEFAULT '', "nay" text DEFAULT '', "vote_count" integer DEFAULT 1, "body" text DEFAULT NULL, "body_html" text DEFAULT NULL, "created_at" datetime DEFAULT NULL, "updated_at" datetime DEFAULT NULL);
0
 CREATE TABLE schema_info (version integer);
0
 CREATE INDEX "index_articles_on_permalink" ON articles ("permalink");
0
 CREATE INDEX "index_articles_on_published_at" ON articles ("published_at");
0
 CREATE INDEX "index_assets_on_attachable_id" ON assets ("attachable_id");
0
 CREATE INDEX "index_assets_on_attachable_type" ON assets ("attachable_type");
0
 CREATE INDEX "index_assets_on_parent_id" ON assets ("parent_id");
0
+CREATE INDEX "index_comments_on_approved" ON comments ("approved");
0
 CREATE INDEX "index_comments_on_article_id" ON comments ("article_id");
0
 INSERT INTO schema_info (version) VALUES (3)
0
\ No newline at end of file

Comments

No one has commented yet.