springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Fixed download method enquiry attachments

Browse source
This commit is contained in:
Karl Cordes 2011-03-11 13:58:26 +11:00
parent abd7f453db
commit 9fbaca261f
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/email_attachments_controller.php
View file

@ -12,8 +12,6 @@ class EmailAttachmentsController extends AppController {
$file = $this->EmailAttachment->findById($id); $file = $this->EmailAttachment->findById($id);
$file_path = Configure::read('email_directory'); $file_path = Configure::read('email_directory');
echo $file_path."/".$file['EmailAttachment']['name'];
die();
if(file_exists($file_path."/".$file['EmailAttachment']['name'])) { if(file_exists($file_path."/".$file['EmailAttachment']['name'])) {

1
models/email.php
View file

@ -12,6 +12,7 @@ class Email extends AppModel {
'EmailAttachment' => array('className' => 'EmailAttachment', 'EmailAttachment' => array('className' => 'EmailAttachment',
'foreignKey' => 'email_id', 'foreignKey' => 'email_id',
'dependent' => true, 'dependent' => true,
'order' => 'EmailAttachment.size DESC',
'counterCache'=>'email_attachment_count'), 'counterCache'=>'email_attachment_count'),
'EmailRecipient' => array('className' => 'EmailRecipient', 'EmailRecipient' => array('className' => 'EmailRecipient',

4
models/email_attachment.php
View file

@ -3,6 +3,10 @@ class EmailAttachment extends AppModel {
var $name = 'EmailAttachment'; var $name = 'EmailAttachment';
var $order = "EmailAttachment.size DESC";
var $belongsTo = array( var $belongsTo = array(
'Email' => array('className' => 'Email', 'Email' => array('className' => 'Email',
'foreignKey' => 'email_id', 'foreignKey' => 'email_id',

2
views/enquiries/add.ctp
View file

@ -11,7 +11,7 @@ doesn't appear in the drop down list, click 'New Contact'")); ?>
echo $form->input('Customer.name', array('readonly'=>'readonly', 'value'=>$customer['Customer']['name'])); echo $form->input('Customer.name', array('readonly'=>'readonly', 'value'=>$customer['Customer']['name']));
echo $form->input('user_id', array('label' =>'Assigned to User'), $users); echo $form->input('user_id', array('label' =>'Assigned to User'), $users);
echo '<div id="contact">'; echo '<div id="contact">';
echo $form->input('contact_user_id', array('div' => false)); echo $form->input('contact_user_id', array('type'=>'select', 'options'=>$contacts));
echo '<br>'; echo '<br>';
//echo $ajax->link('New Contact', array('controller' => 'contacts', 'action' => 'add_one',$customer['Customer']['id']), array('update'=>'contact')); //echo $ajax->link('New Contact', array('controller' => 'contacts', 'action' => 'add_one',$customer['Customer']['id']), array('update'=>'contact'));
//echo $html->image('contact-new.png'); //echo $html->image('contact-new.png');

8
webroot/js/add_edit_user.js
View file

@ -32,13 +32,15 @@ $(function() {
autoOpen: false, autoOpen: false,
width: 450, width: 450,
modal: true, modal: true,
title: 'Add a Contact' position: 'top',
}); });
$("#addContactUser").click(function() { //Meh, we'll just repeat this for the 3 user types. Easiest way to handle this.' $("#addContactUser").click(function() { //Adding a Contact to a Customer.
var userType = 'contact'; var userType = 'contact';
var customer_id = $('.customer_id').attr('id'); var customer_id = $('.customer_id').attr('id');
var thisAction = 'add' var thisAction = 'add'
$("#addUserDiv").dialog( "option", "title", 'Add Contact to Customer' );
$("#addUserDiv").load('/users/add_edit/action:'+thisAction+'/type:'+userType+'/customer_id:'+customer_id); $("#addUserDiv").load('/users/add_edit/action:'+thisAction+'/type:'+userType+'/customer_id:'+customer_id);
$("#addUserDiv").dialog('open'); $("#addUserDiv").dialog('open');
return false; return false;
@ -50,7 +52,7 @@ $(function() {
var userType ='contact'; var userType ='contact';
var thisAction = 'edit'; var thisAction = 'edit';
var user_id = $(this).attr('id'); var user_id = $(this).attr('id');
$("#addUserDiv").dialog( "option", "title", 'Edit Customer Contact' );
$("#addUserDiv").load('/users/add_edit/action:'+thisAction+'/type:'+userType+'/user_id:'+user_id); $("#addUserDiv").load('/users/add_edit/action:'+thisAction+'/type:'+userType+'/user_id:'+user_id);
$("#addUserDiv").dialog('open'); $("#addUserDiv").dialog('open');