From d5f198a777c30adc0bfa9970849c04a484a386e8 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Mon, 22 Sep 2014 22:57:23 +0400
Subject: [PATCH] errors: final stage
---
db/StoredProcedures.sql | 2 +-
.../classes/Controller/Handler/ErrMessages.php | 17 ++++++++++++-----
.../application/classes/Model/errMessages.php | 3 +--
~dev_rating/media/js/errDialog.js | 8 ++++++--
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index d3843bc34..587edd2db 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -3399,7 +3399,7 @@ BEGIN
INSERT INTO `requests`
(requests.AccountID, requests.Title, requests.Description, requests.Status)
VALUES (AccountID, vTitle, vDescription, 'opened');
- RETURN 0;
+ RETURN LAST_INSERT_ID();
END//
diff --git a/~dev_rating/application/classes/Controller/Handler/ErrMessages.php b/~dev_rating/application/classes/Controller/Handler/ErrMessages.php
index 3be159e8a..ac9c7947d 100644
--- a/~dev_rating/application/classes/Controller/Handler/ErrMessages.php
+++ b/~dev_rating/application/classes/Controller/Handler/ErrMessages.php
@@ -19,19 +19,26 @@ class Controller_Handler_ErrMessages extends Controller_Handler {
++$i;
}
$res['num'] = --$i;
+
$this->response->body(json_encode($res));
}
public function action_createRequest() {
$title = $_POST['title'];
$text = $_POST['text'];
+ $result = $this->model->newRequest($this->user['AccID'], $title, $text);
- $to = "it.lab.mmcs@gmail.com";
- //$headers = "From: it.lab.mmcs@gmail.com";
- mail($to, $title, $text);// $headers);
- $result = $this->model->newRequest($this->user['AccID'], $title, $text);
- $data['success'] = ($result[0]['Num'] == 0);
+ if ($result[0]['Num'] > 0) {
+ $to = "it.lab.mmcs@gmail.com";
+ $header = "Reply-To: ".$this->user['AccEMail'];
+ $title = "Request ".$result[0]['Num'].": ".$title;
+ $data['success'] = true;
+ mail($to, $title, $text, $headers);
+ }
+ else
+ $data['success'] = false;
+
$this->response->body(json_encode($data));
}
}
diff --git a/~dev_rating/application/classes/Model/errMessages.php b/~dev_rating/application/classes/Model/errMessages.php
index 12da2cd77..5ae82590b 100644
--- a/~dev_rating/application/classes/Model/errMessages.php
+++ b/~dev_rating/application/classes/Model/errMessages.php
@@ -11,8 +11,7 @@ class Model_errMessages extends Model
public function newRequest($accID, $title, $description)
{
- $sql = "SELECT `CreateRequest`('$accID', '$title', '$description') AS 'result'; ";
-
+ $sql = "SELECT `CreateRequest`('$accID', '$title', '$description') AS 'Num'; ";
return DB::query(Database::SELECT, $sql)->execute();
}
diff --git a/~dev_rating/media/js/errDialog.js b/~dev_rating/media/js/errDialog.js
index 1ba200523..5186fb794 100644
--- a/~dev_rating/media/js/errDialog.js
+++ b/~dev_rating/media/js/errDialog.js
@@ -9,8 +9,8 @@ $(document).ready(function() {
modal: false,
width: 490,
show: {
- effect: "fade",
- duration: 300
+ effect: "fade",
+ duration: 300
}
});
@@ -86,6 +86,10 @@ $(document).ready(function() {
$('#errButton').click(function()
{
+ $('.dialogMyMessages').animate({height: "0px"}, 0).html('');
+ checkMessages = false;
+ $('#messageTitle').val('');
+ $('#message').val('');
$('#errDialog').dialog("open");
});
--
GitLab