From 37c32f8ce7356381b1a4dee63223e9fa9e48a932 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 16 Sep 2014 19:24:20 +0000 Subject: [PATCH] Added ajaxCall to get all phone Numbers. Also cleanup templates --- appinfo/routes.php | 1 + controller/smscontroller.php | 12 ++++++++++-- templates/main.php | 1 - templates/part.settings.php | 10 ---------- 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 templates/part.settings.php diff --git a/appinfo/routes.php b/appinfo/routes.php index a96de9c..a8fcf38 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -18,4 +18,5 @@ $application->registerRoutes($this, array('routes' => array( array('name' => 'sms#push', 'url' => '/push', 'verb' => 'POST'), array('name' => 'sms#replace', 'url' => '/replace', 'verb' => 'POST'), array('name' => 'sms#retrieve_all_ids', 'url' => '/get/smsidlist', 'verb' => 'GET'), + array('name' => 'sms#retrieve_all_peers', 'url' => '/get/peerlist', 'verb' => 'GET'), ))); diff --git a/controller/smscontroller.php b/controller/smscontroller.php index 09354e2..718e456 100644 --- a/controller/smscontroller.php +++ b/controller/smscontroller.php @@ -38,12 +38,10 @@ class SmsController extends Controller { $mboxes = array( 'PNLConversations' => array( 'label' => 'Conversations', - 'phoneNumbers' => $this->smsMapper->getAllPeersPhoneNumbers($this->userId), 'url' => \OCP\Util::linkToAbsolute('index.php', 'apps/ocsms/', array('feed' => 'conversations')) ), 'PNLDrafts' => array( 'label' => 'Drafts', - 'phoneNumbers' => array(), 'url' => \OCP\Util::linkToAbsolute('index.php', 'apps/ocsms/', array('feed' => 'drafts')) ) ); @@ -63,6 +61,16 @@ class SmsController extends Controller { return new JSONResponse(array("smslist" => $smsList)); } + /** + * @NoAdminRequired + * @NoCSRFRequired + */ + public function retrieveAllPeers () { + $phoneList = $this->smsMapper->getAllPeersPhoneNumbers($this->userId); + // @ TODO: filter correctly + return new JSONResponse(array("phonelist" => $phoneList)); + } + /** * @NoAdminRequired */ diff --git a/templates/main.php b/templates/main.php index 0e4c809..4073351 100644 --- a/templates/main.php +++ b/templates/main.php @@ -6,7 +6,6 @@
inc('part.navigation')); ?> - inc('part.settings'));*/ ?>
diff --git a/templates/part.settings.php b/templates/part.settings.php deleted file mode 100644 index b0a221e..0000000 --- a/templates/part.settings.php +++ /dev/null @@ -1,10 +0,0 @@ -
-
- -
-
- -
-
\ No newline at end of file