mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

- upgrade to JSON.pm, v.2

This commit is contained in:
ccooper%deadsquid.com 2008-06-16 19:38:22 +00:00
Родитель 09ffe4f0ee
Коммит 2f0698b8e3
12 изменённых файлов: 82 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
webtools/litmus/advanced_search.cgi
Просмотреть файл

@ -36,7 +36,7 @@ if ($Litmus::Config::DEBUG) {
$t0 = [gettimeofday];
}
use JSON;
use JSON -convert_blessed_universally;
use Litmus;
use Litmus::Auth;
use Litmus::Cache;
@ -393,11 +393,11 @@ if ($is_admin) {
$users = Litmus::FormWidget->getUsers;
}
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $opsyses_js = $json->objToJson($opsyses);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $opsyses_js = $json->allow_unknown->convert_blessed->encode($opsyses);
my $fields = Litmus::FormWidget->getFields;
my $match_criteria = Litmus::FormWidget->getMatchCriteria;

36
webtools/litmus/json.cgi
Просмотреть файл

@ -34,13 +34,13 @@ use Litmus::Auth;
use Litmus::Error;
use Litmus::DB::TestRun;
use Text::Markdown;
use JSON;
use JSON -convert_blessed_universally;
use CGI;
use Data::Dumper;
use Date::Manip;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $json = new JSON;
Litmus->init();
my $c = Litmus->cgi();
@ -72,7 +72,7 @@ if ($c->param("testcase_id")) {
if ($@) {
$testcase->{'expected_results_formatted'} = $testcase->expected_results;
}
$js = $json->objToJson($testcase);
$js = $json->allow_unknown->convert_blessed->encode($testcase);
}
} elsif ($c->param("subgroup_id")) {
my $subgroup_id = $c->param("subgroup_id");
@ -89,7 +89,7 @@ if ($c->param("testcase_id")) {
# messages.
my $creator = Litmus::DB::User->retrieve($subgroup->creator_id->user_id);
eval{$subgroup->creator_id->email($creator->email);};
$js = $json->objToJson($subgroup);
$js = $json->allow_unknown->convert_blessed->encode($subgroup);
$subgroup->creator_id->discard_changes;
} elsif ($c->param("testgroup_id")) {
my $testgroup_id = $c->param("testgroup_id");
@ -106,7 +106,7 @@ if ($c->param("testcase_id")) {
# messages.
my $creator = Litmus::DB::User->retrieve($testgroup->creator_id->user_id);
$testgroup->creator_id->email($creator->email);
$js = $json->objToJson($testgroup);
$js = $json->allow_unknown->convert_blessed->encode($testgroup);
$testgroup->creator_id->discard_changes;
} elsif ($c->param("test_run_id")) {
my $test_run_id = $c->param("test_run_id");
@ -126,7 +126,7 @@ if ($c->param("testcase_id")) {
my $criteria = $test_run->getCriteria();
$test_run->{'criteria'} = $criteria;
}
$js = $json->objToJson($test_run);
$js = $json->allow_unknown->convert_blessed->encode($test_run);
} elsif ($c->param("test_runs_by_branch_product_name")) {
my $branch;
my $product;
@ -146,7 +146,7 @@ if ($c->param("testcase_id")) {
} elsif ($c->param("branch_name")) {
@runs = Litmus::DB::TestRun->search(branch => $branch);
}
$js = $json->objToJson(@runs);
$js = $json->allow_unknown->convert_blessed->encode(@runs);
} elsif ($c->param("validate_login")) {
my $uname = $c->param("username");
my $passwd = $c->param("password");
@ -193,44 +193,44 @@ if ($c->param("testcase_id")) {
$args{"start_timestamp"} = &Date::Manip::UnixDate(&Date::Manip::ParseDateString("1 month ago"),"%q");
}
$l10n = Litmus::DB::Testresult->getL10nAggregateResults(\%args);
$js = $json->objToJson($l10n);
$js = $json->allow_unknown->convert_blessed->encode($l10n);
} elsif ($c->param("product_id")) {
my $product_id = $c->param("product_id");
my $product = Litmus::DB::Product->retrieve($product_id);
$js = $json->objToJson($product);
$js = $json->allow_unknown->convert_blessed->encode($product);
} elsif ($c->param("platform_id")) {
my $platform_id = $c->param("platform_id");
my $platform = Litmus::DB::Platform->retrieve($platform_id);
my @products = Litmus::DB::Product->search_ByPlatform($platform_id);
$platform->{'products'} = \@products;
$js = $json->objToJson($platform);
$js = $json->allow_unknown->convert_blessed->encode($platform);
} elsif ($c->param("branch_id")) {
my $branch_id = $c->param("branch_id");
my $branch = Litmus::DB::Branch->retrieve($branch_id);
$js = $json->objToJson($branch);
$js = $json->allow_unknown->convert_blessed->encode($branch);
} elsif ($c->param("opsys_id")) {
my $opsys_id = $c->param("opsys_id");
my $opsys = Litmus::DB::Opsys->retrieve($opsys_id);
$js = $json->objToJson($opsys);
$js = $json->allow_unknown->convert_blessed->encode($opsys);
} elsif ($c->param("testday_id")) {
use Litmus::DB::TestDay;
my $testday_id = $c->param("testday_id");
my $testday = Litmus::DB::TestDay->retrieve($testday_id);
my @subgroups = Litmus::DB::Subgroup->search_ByTestDay($testday_id);
$testday->{'subgroups'} = \@subgroups;
$js = $json->objToJson($testday);
$js = $json->allow_unknown->convert_blessed->encode($testday);
} elsif ($c->param("products")) {
my @products = Litmus::DB::Product->retrieve_all();
$js = $json->objToJson(\@products);
$js = $json->allow_unknown->convert_blessed->encode(\@products);
} elsif ($c->param("platforms")) {
my @platforms = Litmus::DB::Platform->retrieve_all();
$js = $json->objToJson(\@platforms);
$js = $json->allow_unknown->convert_blessed->encode(\@platforms);
} elsif ($c->param("opsyses")) {
my @opsyses = Litmus::DB::Opsys->retrieve_all();
$js = $json->objToJson(\@opsyses);
$js = $json->allow_unknown->convert_blessed->encode(\@opsyses);
} elsif ($c->param("branches")) {
my @branches = Litmus::DB::Branch->retrieve_all();
$js = $json->objToJson(\@branches);
$js = $json->allow_unknown->convert_blessed->encode(\@branches);
} elsif ($c->param("user_stats")) {
my %stats;
my $uname = $c->param("user_stats");
@ -245,7 +245,7 @@ if ($c->param("testcase_id")) {
$user->id(), 30)]->[0]->num_results();
$stats{'alltime'} = [Litmus::DB::Testresult->search_NumResultsByUserDays(
$user->id(), 40000)]->[0]->num_results(); # 40000 is close enough to forever :)
$js = $json->objToJson(\%stats);
$js = $json->allow_unknown->convert_blessed->encode(\%stats);
}
if ($js) {

10
webtools/litmus/manage_categories.cgi
Просмотреть файл

@ -42,7 +42,7 @@ use Litmus::Utils qw(sanitize);
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
Litmus::Auth::requireProductAdmin("edit_categories.cgi");
@ -427,10 +427,10 @@ if (Litmus::Auth::getCurrentUser()->isSuperUser()) {
}
$branches = $authorized_branches;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $vars = {
title => 'Manage Categories',

14
webtools/litmus/manage_subgroups.cgi
Просмотреть файл

@ -37,7 +37,7 @@ use Litmus::Utils;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
my $c = Litmus->cgi();
@ -297,12 +297,12 @@ foreach my $b (@{$subgroups}) {
$subgroups = \@tmp_subgroups;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $subgroups_js = $json->objToJson($subgroups);
my $testcases_js = $json->objToJson($testcases);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $subgroups_js = $json->allow_unknown->convert_blessed->encode($subgroups);
my $testcases_js = $json->allow_unknown->convert_blessed->encode($testcases);
$vars->{'title'} = "Manage Subgroups";
$vars->{'products'} = $products;

14
webtools/litmus/manage_test_runs.cgi
Просмотреть файл

@ -38,7 +38,7 @@ use Litmus::DB::TestRun;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
#########################################################################
sub getCriteria {
@ -294,12 +294,12 @@ foreach my $b (@{$test_runs}) {
}
$test_runs = \@tmp_testruns;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $platforms_js = $json->objToJson($platforms);
my $opsyses_js = $json->objToJson($opsyses);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $platforms_js = $json->allow_unknown->convert_blessed->encode($platforms);
my $opsyses_js = $json->allow_unknown->convert_blessed->encode($opsyses);
$vars->{'title'} = "Manage Test Runs";
$vars->{'test_runs'} = $test_runs;

12
webtools/litmus/manage_testcases.cgi
Просмотреть файл

@ -37,7 +37,7 @@ use Litmus::Utils;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
my $c = Litmus->cgi();
@ -290,11 +290,11 @@ foreach my $b (@{$testcases}) {
}
$testcases = \@tmp_testcases;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $subgroups_js = $json->objToJson($subgroups);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $subgroups_js = $json->allow_unknown->convert_blessed->encode($subgroups);
$vars->{'title'} = "Manage Testcases";
$vars->{'testcases'} = $testcases;

12
webtools/litmus/manage_testdays.cgi
Просмотреть файл

@ -41,7 +41,7 @@ use Litmus::FormWidget;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
Litmus::Auth::requireRunDayAdmin("manage_testdays.cgi");
@ -193,11 +193,11 @@ my $testdays = Litmus::FormWidget->getTestdays();
my $locales = Litmus::FormWidget->getLocales;
my $authors = Litmus::FormWidget->getAuthors();
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $subgroups_js = $json->objToJson($subgroups);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $subgroups_js = $json->allow_unknown->convert_blessed->encode($subgroups);
my $vars = {
title => 'Manage Testdays',

10
webtools/litmus/manage_testgroups.cgi
Просмотреть файл

@ -37,7 +37,7 @@ use Litmus::Utils;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
my $c = Litmus->cgi();
@ -263,10 +263,10 @@ foreach my $b (@{$testgroups}) {
$testgroups = \@tmp_testgroups;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $subgroups_js = $json->objToJson($subgroups);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $subgroups_js = $json->allow_unknown->convert_blessed->encode($subgroups);
$vars->{'title'} = "Manage Testgroups";
$vars->{'products'} = $products;

10
webtools/litmus/run_tests.cgi
Просмотреть файл

@ -41,7 +41,7 @@ use Litmus::SysConfig;
use Litmus::Auth;
use CGI;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
@ -93,10 +93,10 @@ sub displaySysConfig() {
my $opsyses = Litmus::FormWidget->getOpsyses();
my $locales = Litmus::FormWidget->getLocales();
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $test_run_js = $json->objToJson($test_run);
my $platforms_js = $json->objToJson($platforms);
my $opsyses_js = $json->objToJson($opsyses);
my $json = new JSON;
my $test_run_js = $json->allow_unknown->convert_blessed->encode($test_run);
my $platforms_js = $json->allow_unknown->convert_blessed->encode($platforms);
my $opsyses_js = $json->allow_unknown->convert_blessed->encode($opsyses);
my $vars = {
title => $title,

8
webtools/litmus/search_results.cgi
Просмотреть файл

@ -36,7 +36,7 @@ use Litmus::DB::Testresult;
use Litmus::FormWidget;
use CGI;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
my $c = Litmus->cgi();
@ -206,9 +206,9 @@ my $result_statuses = Litmus::FormWidget->getResultStatuses;
my $branches = Litmus::FormWidget->getBranches;
my $locales = Litmus::FormWidget->getLocales;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $title = 'Search Test Results';

16
webtools/litmus/show_test.cgi
Просмотреть файл

@ -34,7 +34,7 @@ use Litmus::DB::Resultbug;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
my $c = Litmus->cgi();
@ -59,13 +59,13 @@ my $platforms = Litmus::FormWidget->getUniquePlatforms($show_admin);
my $opsyses = Litmus::FormWidget->getOpsyses($show_admin);
my $locales = Litmus::FormWidget->getLocales();
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $subgroups_js = $json->objToJson($subgroups);
my $platforms_js = $json->objToJson($platforms);
my $opsyses_js = $json->objToJson($opsyses);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
my $subgroups_js = $json->allow_unknown->convert_blessed->encode($subgroups);
my $platforms_js = $json->allow_unknown->convert_blessed->encode($platforms);
my $opsyses_js = $json->allow_unknown->convert_blessed->encode($opsyses);
$vars->{'products_js'} = $products_js;
$vars->{'branches_js'} = $branches_js;

10
webtools/litmus/testday_report.cgi
Просмотреть файл

@ -34,7 +34,7 @@ use Litmus::TestEvent;
use CGI;
use Date::Manip;
use JSON;
use JSON -convert_blessed_universally;
Litmus->init();
my $c = Litmus->cgi();
@ -111,10 +111,10 @@ if ($user) {
my $products = Litmus::FormWidget->getProducts;
my $branches = Litmus::FormWidget->getBranches;
my $testgroups = Litmus::FormWidget->getTestgroups;
my $json = JSON->new(skipinvalid => 1, convblessed => 1);
my $products_js = $json->objToJson($products);
my $branches_js = $json->objToJson($branches);
my $testgroups_js = $json->objToJson($testgroups);
my $json = new JSON;
my $products_js = $json->allow_unknown->convert_blessed->encode($products);
my $branches_js = $json->allow_unknown->convert_blessed->encode($branches);
my $testgroups_js = $json->allow_unknown->convert_blessed->encode($testgroups);
$vars->{'products_js'} = $products_js;
$vars->{'branches_js'} = $branches_js;