You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/04/29 21:45:52 UTC
[1/2] airavata-php-gateway git commit: updating thrift files
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 396346f6a -> c27685474
updating thrift files
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/be74b865
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/be74b865
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/be74b865
Branch: refs/heads/develop
Commit: be74b8654f1a7e9415b5b89fdc4e5fe859ec42db
Parents: 8b67709
Author: scnakandala <su...@gmail.com>
Authored: Fri Apr 29 15:45:41 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Apr 29 15:45:41 2016 -0400
----------------------------------------------------------------------
.../Airavata/Model/Workspace/Types.php | 91 ++++++++++++++++----
1 file changed, 74 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/be74b865/app/libraries/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php
index cb7b721..61355c2 100644
--- a/app/libraries/Airavata/Model/Workspace/Types.php
+++ b/app/libraries/Airavata/Model/Workspace/Types.php
@@ -17,6 +17,17 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
+final class NotificationPriority {
+ const LOW = 0;
+ const NORMAL = 1;
+ const HIGH = 2;
+ static public $__names = array(
+ 0 => 'LOW',
+ 1 => 'NORMAL',
+ 2 => 'HIGH',
+ );
+}
+
class Group {
static $_TSPEC;
@@ -668,15 +679,23 @@ class Notification {
/**
* @var string
*/
- public $notifcationMessage = null;
+ public $notificationMessage = null;
/**
* @var int
*/
- public $publishedtime = null;
+ public $creationTime = null;
+ /**
+ * @var int
+ */
+ public $publishedTime = null;
/**
* @var int
*/
public $expirationTime = null;
+ /**
+ * @var int
+ */
+ public $priority = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -694,17 +713,25 @@ class Notification {
'type' => TType::STRING,
),
4 => array(
- 'var' => 'notifcationMessage',
+ 'var' => 'notificationMessage',
'type' => TType::STRING,
),
5 => array(
- 'var' => 'publishedtime',
+ 'var' => 'creationTime',
'type' => TType::I64,
),
6 => array(
+ 'var' => 'publishedTime',
+ 'type' => TType::I64,
+ ),
+ 7 => array(
'var' => 'expirationTime',
'type' => TType::I64,
),
+ 8 => array(
+ 'var' => 'priority',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
@@ -717,15 +744,21 @@ class Notification {
if (isset($vals['title'])) {
$this->title = $vals['title'];
}
- if (isset($vals['notifcationMessage'])) {
- $this->notifcationMessage = $vals['notifcationMessage'];
+ if (isset($vals['notificationMessage'])) {
+ $this->notificationMessage = $vals['notificationMessage'];
}
- if (isset($vals['publishedtime'])) {
- $this->publishedtime = $vals['publishedtime'];
+ if (isset($vals['creationTime'])) {
+ $this->creationTime = $vals['creationTime'];
+ }
+ if (isset($vals['publishedTime'])) {
+ $this->publishedTime = $vals['publishedTime'];
}
if (isset($vals['expirationTime'])) {
$this->expirationTime = $vals['expirationTime'];
}
+ if (isset($vals['priority'])) {
+ $this->priority = $vals['priority'];
+ }
}
}
@@ -771,25 +804,39 @@ class Notification {
break;
case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->notifcationMessage);
+ $xfer += $input->readString($this->notificationMessage);
} else {
$xfer += $input->skip($ftype);
}
break;
case 5:
if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->publishedtime);
+ $xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
case 6:
if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->publishedTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::I64) {
$xfer += $input->readI64($this->expirationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 8:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priority);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -818,21 +865,31 @@ class Notification {
$xfer += $output->writeString($this->title);
$xfer += $output->writeFieldEnd();
}
- if ($this->notifcationMessage !== null) {
- $xfer += $output->writeFieldBegin('notifcationMessage', TType::STRING, 4);
- $xfer += $output->writeString($this->notifcationMessage);
+ if ($this->notificationMessage !== null) {
+ $xfer += $output->writeFieldBegin('notificationMessage', TType::STRING, 4);
+ $xfer += $output->writeString($this->notificationMessage);
$xfer += $output->writeFieldEnd();
}
- if ($this->publishedtime !== null) {
- $xfer += $output->writeFieldBegin('publishedtime', TType::I64, 5);
- $xfer += $output->writeI64($this->publishedtime);
+ if ($this->creationTime !== null) {
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5);
+ $xfer += $output->writeI64($this->creationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->publishedTime !== null) {
+ $xfer += $output->writeFieldBegin('publishedTime', TType::I64, 6);
+ $xfer += $output->writeI64($this->publishedTime);
$xfer += $output->writeFieldEnd();
}
if ($this->expirationTime !== null) {
- $xfer += $output->writeFieldBegin('expirationTime', TType::I64, 6);
+ $xfer += $output->writeFieldBegin('expirationTime', TType::I64, 7);
$xfer += $output->writeI64($this->expirationTime);
$xfer += $output->writeFieldEnd();
}
+ if ($this->priority !== null) {
+ $xfer += $output->writeFieldBegin('priority', TType::I32, 8);
+ $xfer += $output->writeI32($this->priority);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[2/2] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/c2768547
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c2768547
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c2768547
Branch: refs/heads/develop
Commit: c276854740f990f74f430f531e9dee240eb03632
Parents: be74b86 396346f
Author: scnakandala <su...@gmail.com>
Authored: Fri Apr 29 15:45:49 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Apr 29 15:45:49 2016 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 5 +
app/controllers/AdminController.php | 42 ++-
app/libraries/AdminUtilities.php | 27 +-
app/libraries/CommonUtilities.php | 76 ++++-
app/routes.php | 14 +-
app/views/admin/manage-credentials.blade.php | 53 ---
app/views/admin/manage-notices.blade.php | 383 ++++++++++++++--------
app/views/layout/basic.blade.php | 9 +
app/views/partials/dashboard-block.blade.php | 2 +-
public/css/bootstrap.min.css | 35 +-
10 files changed, 431 insertions(+), 215 deletions(-)
----------------------------------------------------------------------