Changeset 17116

Timestamp:

08/05/08 23:18:49 (5 years ago)

Author:

tomi-ru

Message:

エントリの削除機能追加。Catalyst::Controller::Resourcesを使う

Location:

websites/mobilecat/trunk

Files:

• lib/MobileCat/Controller/API/Mail/Post.pm (modified) (1 diff)
• lib/MobileCat/Controller/Entry.pm (modified) (3 diffs)
• lib/MobileCat/Controller/Root.pm (modified) (1 diff)
• mobilecat.yaml (modified) (1 diff)
• root/entry/list.tt (modified) (2 diffs)
• root/entry/page.tt (deleted)
• root/entry/post.tt (added)
• root/entry/show.tt (added)
• root/index.tt (modified) (2 diffs)
• root/post.tt (deleted)
• root/settings/index.tt (modified) (1 diff)
• root/static/mobile.css (modified) (1 diff)

websites/mobilecat/trunk/lib/MobileCat/Controller/API/Mail/Post.pm

@@ -41 +41 @@
     $c->req->param(filter => 1);
     $c->req->param(body   => $text);
-    $c->forward('/post');
+    $c->forward('/entry/create');
 }
 

websites/mobilecat/trunk/lib/MobileCat/Controller/Entry.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use base 'Catalyst::Controller';
+use base 'Catalyst::Controller::Resources';
 
-sub default :Path {
-    my ($self, $c, $entry_id) = @_;
+__PACKAGE__->config( member => {
+    delete => { method => 'POST',  path => 'delete' },
+});
 
-    if ($entry_id) {
-        $c->view('TT')->template('entry/page.tt');
-        $c->forward('page', [ $entry_id ]);
-    }
-    elsif (my $user_id = $c->req->param('user')) {
-        $c->view('TT')->template('entry/list.tt');
-        $c->forward('user', [ $user_id ]);
-    }
-    else {
-        $c->view('TT')->template('entry/list.tt');
+use Acme::Neko;
+
+sub list {
+    my ($self, $c) = @_;
+    if (my $user_id = $c->req->param('user')) {
+        $c->forward('user_list', [ $user_id ]);
+    } else {
         $c->forward('recent');
     }
@@ -25 +23 @@
     $c->stash->{entries} = $c->model('Entries')->search(undef, {
         order_by => ['created_at DESC'],
-        page     => 1,
         rows     => 5,
     });
 }
 
-sub user :Private {
+sub user_list :Private {
     my ($self, $c, $user_id) = @_;
     my $user = $c->model('Users')->find($user_id);
-    unless ($user) {
-        $c->error(404);
-        return;
-    }
     
     $c->stash->{entries} = $c->model('Entries')->search({
@@ -47 +40 @@
 }
 
-sub page :Private {
+sub post {
+    my ($self, $c) = @_;
+}
+
+sub create {
+    my ($self, $c) = @_;
+    
+    $c->view('TT')->template('entry/post.tt');
+
+    if ($c->req->param('filter')) {
+        $c->req->param(body => do {
+            Acme::Neko->nya( $c->req->param('body') );
+        });
+    }
+    
+    $c->req->param(user_agent => $c->req->user_agent);
+    $c->req->param(user_id    => $c->user->id) if $c->user_exists;
+    $c->form(
+        body       => [ 'NOT_BLANK', ['NOT_REGEX', qr/^\s+$/] ],
+        user_agent => [],
+        user_id    => [],
+    );
+    
+    if ($c->form->has_error) {
+        return;
+    } else {
+        $c->model('Entries')->create($c->form->valid);
+    }
+    
+    $c->res->redirect( $c->uri_for('/') );
+}
+
+sub show {
     my ($self, $c, $entry_id) = @_;
-    my $entry = $c->model('Entries')->find($entry_id);
-    unless ($entry) {
+    $c->stash->{entry} = $c->model('Entries')->find($entry_id) or do {
         $c->error(404);
         return;
+    };
+}
+
+sub delete {
+    my ($self, $c, $entry_id) = @_;
+    if (not $c->user_exists) {
+        return;
     }
+     
+    my $entry = $c->model('Entries')->single({
+        id      => $entry_id,
+        user_id => $c->user->id,
+    }) or do {
+        $c->error(404);
+        return;
+    };
     
-    $c->stash->{entry} = $entry;
+    $entry->delete;
+    
+    $c->res->redirect( $c->uri_for('/entry', { user => $c->user->id }) );
 }
 

websites/mobilecat/trunk/lib/MobileCat/Controller/Root.pm

@@ -6 +6 @@
 __PACKAGE__->config->{namespace} = '';
 
-use Acme::Neko;
-
 sub index :Private {
     my ($self, $c) = @_;
     $c->forward('/entry/recent');
-}
-
-sub post :Local {
-    my ($self, $c) = @_;
-    
-    return unless $c->req->method eq 'POST';
-    
-    if ($c->req->param('filter')) {
-        $c->req->param(body => do {
-            Acme::Neko->nya( $c->req->param('body') );
-        });
-    }
-     
-    $c->req->param(user_agent => $c->req->user_agent);
-    $c->req->param(user_id    => $c->user->id) if $c->user_exists;
-    $c->form(
-        body       => [ 'NOT_BLANK', ['NOT_REGEX', qr/^\s+$/] ],
-        user_agent => [],
-        user_id    => [],
-    );
-    
-    if ($c->form->has_error) {
-        return;
-    } else {
-        $c->model('Entries')->create($c->form->valid);
-    }
-    
-    $c->res->redirect( $c->uri_for('/') );
 }
 

websites/mobilecat/trunk/mobilecat.yaml

@@ -8 +8 @@
   expires: 3600
   storage: /tmp/mobilecat/session
+  param: sid
 
 validator:

websites/mobilecat/trunk/root/entry/list.tt

@@ -1 +1 @@
 [% WHILE (entry = entries.next);
-     INCLUDE "entry/page.tt";
+     INCLUDE "entry/show.tt";
    END;
 %]
 
-[% IF template.name == "entry/list.tt" %]
-
+[% IF entries.attrs.page %]
 <div class="center">
 [% FOREACH page = entries.pager.pages_in_navigation(5) %]
@@ -23 +22 @@
 [% END %]
 </div>
+[% END %]
 
+[% IF template.name == "entry/list.tt" %]
 <br />
 &#xE6E9;<a href="[% c.req.uri.hostless %]" accesskey="8">更新</a><br />

websites/mobilecat/trunk/root/index.tt

@@ -1 @@
-&#xE719;<a href="/post">投稿する</a><br />
+&#xE719;<a href="/entry/new">投稿する</a><br />
 <br />
 
@@ -6 +6 @@
 <br />
 &#xE6EB;<a href="/" accesskey="0">更新</a><br />
-&#xE6E2;<a href="/post" accesskey="1">投稿する</a><br />
+&#xE6E2;<a href="/entry/new" accesskey="1">投稿する</a><br />
 &#xE6FB;<a href="/about">ここは何？</a><br />
 [% IF c.user_exists %]

websites/mobilecat/trunk/root/settings/index.tt

@@ -11 +11 @@
 <img src="http://static.koneta.org/dot.gif" height="5" /><br />
 
+&#xE689;<a href="[% c.uri_for('/entry/', { user => c.user.id }) %]">自分の投稿ﾘｽﾄ</a><br />
+<img src="http://static.koneta.org/dot.gif" height="5" /><br />
+
 &#xE708;<a href="[% c.uri_for('/logout') %]">ﾛｸﾞｱｳﾄ</a><br />
 <img src="http://static.koneta.org/dot.gif" height="5" /><br />

websites/mobilecat/trunk/root/static/mobile.css

@@ -10 +10 @@
 }
 .small {
-    font-size: 16pt;
+    font-size: smaller;
 }
 .center {