[Isocial-svn] SF.net SVN: isocial: [241] app

[<di...@us...>]

Revision: 241
          http://isocial.svn.sourceforge.net/isocial/?rev=241&view=rev
Author:   dim0s77
Date:     2008-06-17 02:22:52 -0700 (Tue, 17 Jun 2008)

Log Message:
-----------
minor fixes

Modified Paths:
--------------
    app/controllers/message_controller.php
    app/views/message/show.tpl

Modified: app/controllers/message_controller.php
===================================================================
--- app/controllers/message_controller.php	2008-06-16 18:39:40 UTC (rev 240)
+++ app/controllers/message_controller.php	2008-06-17 09:22:52 UTC (rev 241)
@@ -105,7 +105,7 @@
             $this->last_box = !empty($this->params['from']) ? $this->params['from'] : 'inbox';
             $thread  = $this->Message->findFirst(array('thread_id' => $this->params['id'] ));
             $user_id = $this->current_user->getId();
-            if ($thread->sender_id == $user_id || $thread->recipient_id == $user_id ) {
+            if ($thread && ($thread->sender_id == $user_id || $thread->recipient_id == $user_id) ) {
                 $recipient_id = $thread->sender_id == $user_id ? $thread->recipient_id : $thread->sender_id;
                 $this->interlocutor = $this->User->findFirst(array( 'id' => $recipient_id));
                 $messages = $this->Message->find('all', array('conditions' => array('thread_id' => $thread->getId()),

Modified: app/views/message/show.tpl
===================================================================
--- app/views/message/show.tpl	2008-06-16 18:39:40 UTC (rev 240)
+++ app/views/message/show.tpl	2008-06-17 09:22:52 UTC (rev 241)
@@ -4,23 +4,25 @@
 
 <div class="messages_thread">
   <div id="messages">
+    {?interlocutor} {?messages}
     <?= $controller->render(array('partial' =>'thread', 
                                   'locals'  => array('interlocutor' => $interlocutor,
-                                                     'messages' => $messages))); ?>
+                                                     'messages' => $messages))) ?>
+    {end} {end}
   </div>
   <div class="reply_container">
     <form id="reply_message_form" action="/message/show" method="post" onsubmit="return false;">
       <label>_{Reply}:</label>
       <textarea class="textinput" cols="40" id="message_body" name="message[body]" rows="20"></textarea>
-      <input id="message_recipient" name="message[recipient]" type="hidden" value="{interlocutor.id}" />
-      <input id="message_thread_id" name="message[thread_id]" type="hidden" value="{messages-0.thread_id}" />
-      <input id="message_subject" name="message[subject]" type="hidden" value="re: {messages-0.subject}" />
+      <input id="message_recipient" name="message[recipient]" type="hidden" value="{interlocutor.id?}" />
+      <input id="message_thread_id" name="message[thread_id]" type="hidden" value="{messages-0.thread_id?}" />
+      <input id="message_subject" name="message[subject]" type="hidden" value="re: {messages-0.subject?}" />
       <div class="divide_line">&nbsp;</div>
       <div class="submits">
         <input class="submitinput" type="submit" value="_{Send}" onclick="new Ajax.Updater('messages', '/message/reply', { method:'post', asynchronous:true, parameters:Form.serialize('reply_message_form')}); $('message_body').clear(); return false;">
         <input class="cancelinput" type="button" value="_{Back} <? if ($last_box == 'outbox') { ?>_{to Outbox}<? } else { ?>_{to Inbox}<? } ?>" onclick="change_location('{last_box}')">
       </div>
-      <div class="sub_controls"><a href="#" onclick="delete_single_thread(this)" name="{messages-0.id}">_{Delete}</a></div>
+      <div class="sub_controls"><a href="#" onclick="delete_single_thread(this)" name="{messages-0.id?}">_{Delete}</a></div>
     </form>
   </div>
   <div class="clearfix"></div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.