Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3

Browse Source
This commit is contained in:
Christy Jacob
2022-09-13 18:21:44 +00:00
parent 7d3101e077 6fc7f9b384
commit efbe21d433
35 changed files with 639 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Auth/Auth.php
+6 -3
View File
@@ -431,11 +431,14 @@ class Auth
continue;
}
if (isset($node['teamId']) && isset($node['roles'])) {
if (isset($node['$id']) && isset($node['teamId'])) {
$roles[] = Role::team($node['teamId'])->toString();
$roles[] = Role::member($node['$id'])->toString();
foreach ($node['roles'] as $nodeRole) { // Set all team roles
$roles[] = Role::team($node['teamId'], $nodeRole)->toString();
if (isset($node['roles'])) {
foreach ($node['roles'] as $nodeRole) { // Set all team roles
$roles[] = Role::team($node['teamId'], $nodeRole)->toString();
}
}
}
}
src/Appwrite/Usage/Calculators/TimeSeries.php
+1 -1
View File
@@ -323,7 +323,6 @@ class TimeSeries extends Calculator
$document->setAttribute('value', $value)
);
}
$this->latestTime[$metric][$period] = $time;
} catch (\Exception $e) { // if projects are deleted this might fail
if (is_callable($this->errorHandler)) {
call_user_func($this->errorHandler, $e, "sync_project_{$projectId}_metric_{$metric}");
@@ -397,6 +396,7 @@ class TimeSeries extends Calculator
$value,
0
);
$this->latestTime[$metric][$period['key']] = $point['time'];
}
}
} catch (\Exception $e) { // if projects are deleted this might fail
src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
+1 -1
View File
@@ -8,7 +8,7 @@ class Executions extends Base
'trigger',
'status',
'statusCode',
'time'
'duration'
];
/**
src/Appwrite/Utopia/Response/Model/Build.php
+1 -1
View File
@@ -59,7 +59,7 @@ class Build extends Model
])
->addRule('duration', [
'type' => self::TYPE_INTEGER,
'description' => 'The build time in seconds.',
'description' => 'The build duration in seconds.',
'default' => 0,
'example' => 0,
])
src/Appwrite/Utopia/Response/Model/Execution.php
+2 -2
View File
@@ -78,9 +78,9 @@ class Execution extends Model
'default' => '',
'example' => '',
])
->addRule('time', [
->addRule('duration', [
'type' => self::TYPE_FLOAT,
'description' => 'The script execution time in seconds.',
'description' => 'The script execution duration in seconds.',
'default' => 0,
'example' => 0.400,
])