miconware
/
dreamjob
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tape:js ie cache

This commit is contained in:
Martin Müller 2014-05-25 11:30:01 +02:00
parent 600fefb1f0
commit 1419cf24de
7 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/DreamjobJobMsg.php
View File

@ -58,10 +58,10 @@ class DreamjobJobMsg extends AppModel {
if ($result) { if ($result) {
$app = $this->DreamjobJobApplication->find('first', array('conditions' => array('DreamjobJobApplication.id' => $result["DreamjobJobMsg"]["application_id"]))); $app = $this->DreamjobJobApplication->find('first', array('conditions' => array('DreamjobJobApplication.id' => $result["DreamjobJobMsg"]["application_id"])));
if ($this->fromcompany) if ($result["DreamjobJobMsg"]['fromcompany'])
$result = self::sendMail($app['WorkerUser']['mail'], $this->application_id, array('User' => $app['WorkerUser'], 'AppUser' => $app['AppUserWorker']),true); $result = self::sendMail($app['WorkerUser']['mail'], $result["DreamjobJobMsg"]['application_id'], array('User' => $app['WorkerUser'], 'AppUser' => $app['AppUserWorker']),true);
else else
$result = self::sendMail($app['User']['mail'], $this->application_id, array('DreamjobCompany' => $app['DreamjobCompany'])); $result = self::sendMail($app['User']['mail'], $result["DreamjobJobMsg"]['application_id'], array('DreamjobCompany' => $app['DreamjobCompany']));
} }
if ($result) { if ($result) {
$dataSource->commit(); $dataSource->commit();

2
app/View/Emails/html/job_application_msg_company.ctp
View File

@ -1,4 +1,4 @@
Sehr geehrter <?=$data['DreamjobCompany']['owner'];?>!<br/><br/> Sehr geehrte/r <?=$data['DreamjobCompany']['owner'];?>!<br/><br/>
Sie haben eine Nachricht von einem Bewerber erhalten<br/><br/> Sie haben eine Nachricht von einem Bewerber erhalten<br/><br/>
Sehe diese unter folgendem Link ein:<br/> Sehe diese unter folgendem Link ein:<br/>
<?=$this->Html->link('Link',array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true));?> <?=$this->Html->link('Link',array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true));?>

7
app/View/Emails/text/job_application_msg_company.ctp
View File

@ -1,9 +1,12 @@
Sehr geehrter <?=$data['DreamjobCompany']['owner'];?>! Sehr geehrte/r <?=$data['DreamjobCompany']['owner'];?>!
Sie haben eine Nachricht von einem Bewerber erhalten. Sie haben eine Nachricht von einem Bewerber erhalten.
Sehe diese unter folgendem Link ein: Sehe diese unter folgendem Link ein:
<?=$this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages'),true);?> <?php
$url = $this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true) );
echo $this->Html->link($url, $url);
?>
--- ---
Bei Fragen wenden Sie sich gerne an unser Team: Bei Fragen wenden Sie sich gerne an unser Team:

5
app/View/Emails/text/job_application_msg_worker.ctp
View File

@ -3,7 +3,10 @@ Hallo <?=$data['AppUser']['first_name']." ".$data['AppUser']['last_name'];?>!
Du hast eine Nachricht von einem Unternehmen erhalten. Du hast eine Nachricht von einem Unternehmen erhalten.
Sehe diese unter folgendem Link ein: Sehe diese unter folgendem Link ein:
<?=$this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages'),true);?> <?php
$url = $this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true) );
echo $this->Html->link($url, $url);
?>
--- ---
Bei Fragen wenden Sie sich gerne an unser Team: Bei Fragen wenden Sie sich gerne an unser Team:

3
app/View/Pdf/application.ctp
View File

@ -88,7 +88,8 @@ foreach($application['Page'] as $page){
if($page['id'] == $pg['page_ptr_id']) if($page['id'] == $pg['page_ptr_id'])
$pageType=$pg; $pageType=$pg;
} }
$tcpdf->writeHTMLCell(0,235,10,35, $pageType['text'], $dev,0,false,true,'L'); //$tcpdf->writeHTMLCell(0,235,10,35, $pageType['text'], $dev,0,false,true,'L');
$tcpdf->writeHTML($pageType['text']);
}else{ }else{
$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$pageType['image'],0,35,0,235,'','','','',300,'C'); $tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$pageType['image'],0,35,0,235,'','','','',300,'C');
} }

3
app/View/Pdf/profil.ctp
View File

@ -71,7 +71,8 @@ foreach($WORKER['DreamjobPageInh'] as $page){
if($page['id'] == $pg['DreamjobPageInh']['id']) if($page['id'] == $pg['DreamjobPageInh']['id'])
$pageType=$pg; $pageType=$pg;
} }
$tcpdf->writeHTMLCell(0,235,10,35, $pageType['DreamjobPageText']['text'], $dev,0,false,true,'L'); //$tcpdf->writeHTMLCell(0,235,10,35, $pageType['DreamjobPageText']['text'], $dev,0,false,true,'L');
$tcpdf->writeHTML($pageType['DreamjobPageText']['text']);
}else{ }else{
$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$pageType['DreamjobPageImage']['image'],0,35,0,235,'','','','',300,'C'); $tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$pageType['DreamjobPageImage']['image'],0,35,0,235,'','','','',300,'C');
} }

16
app/webroot/js/dreamjob.js
View File

@ -32,13 +32,15 @@ var global_load = null;
function stopLoad(e) { function stopLoad(e) {
if (!e) if (!e)
e = window.event; e = window.event;
if (e.preventDefault) if (e){
e.preventDefault(); if (e.preventDefault)
if (e.stopPropagation) { e.preventDefault();
e.stopPropagation(); if (e.stopPropagation) {
} else { e.stopPropagation();
e.cancelBubble = true; } else {
} e.cancelBubble = true;
}
}
} }
function event(where) { function event(where) {
/* Hotfix Ticket: 215*/ /* Hotfix Ticket: 215*/