Itemref properties cannot be keys so the IsKey parameter is not necessary. Similarly Detailref properties can neither be keys, nor required.
Signed-off-by: Francois Gouget fgouget@codeweavers.com --- testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm | 6 +++--- testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm | 6 +++--- testbot/lib/WineTestBot/CGI/Sessions.pm | 2 +- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- testbot/lib/WineTestBot/PendingPatches.pm | 2 +- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/UserRoles.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index 25144d08c..5825f7486 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -60,10 +60,10 @@ sub ValidateValue($$$) return undef; }
-sub CreateDetailrefPropertyDescriptor($$$$$) +sub CreateDetailrefPropertyDescriptor($$$) { - my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator) = @_; - return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator); + my ($Name, $DisplayName, $Creator) = @_; + return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, !1, !1, $Creator); }
sub SetDetailrefKeyPrefix($@) diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index d79e1d25a..6895e801a 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -72,10 +72,10 @@ sub ValidateValue($$$) return undef; }
-sub CreateItemrefPropertyDescriptor($$$$$$) +sub CreateItemrefPropertyDescriptor($$$$$) { - my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $RefColNames) = @_; - return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $RefColNames); + my ($Name, $DisplayName, $IsRequired, $Creator, $RefColNames) = @_; + return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); }
1; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index d61c6e0ff..5ca84e734 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -72,7 +72,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Session id", 1, 1, "A", 32), CreateBasicPropertyDescriptor("UserName", "User", !1, 1, "A", 40), - CreateItemrefPropertyDescriptor("User", "User", !1, 1, &CreateUsers, ["UserName"]), + CreateItemrefPropertyDescriptor("User", "User", 1, &CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), );
diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 091420d45..140bd572b 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -509,9 +509,9 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 10), CreateBasicPropertyDescriptor("BranchName", "Branch", !1, 1, "A", 20), - CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, &CreateBranches, ["BranchName"]), + CreateItemrefPropertyDescriptor("Branch", "Branch", 1, &CreateBranches, ["BranchName"]), CreateBasicPropertyDescriptor("UserName", "Author", !1, 1, "A", 40), - CreateItemrefPropertyDescriptor("User", "Author", !1, 1, &CreateUsers, ["UserName"]), + CreateItemrefPropertyDescriptor("User", "Author", 1, &CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['new', 'staging', 'queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), @@ -521,8 +521,8 @@ my @PropertyDescriptors = ( # Somehow mod_perl sometimes fails to find CreatePatches() if not given the # fully qualified name, but never has any trouble with the other Create*() # functions. - CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, &WineTestBot::Patches::CreatePatches, ["PatchId"]), - CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, &CreateSteps), + CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, &WineTestBot::Patches::CreatePatches, ["PatchId"]), + CreateDetailrefPropertyDescriptor("Steps", "Steps", &CreateSteps), ); SetDetailrefKeyPrefix("Job", @PropertyDescriptors);
diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 0fedc52e6..51a1d1341 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -193,7 +193,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("EMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("Version", "Version", 1, 1, "N", 2), CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), - CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, &CreatePendingPatches), + CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", &CreatePendingPatches), ); SetDetailrefKeyPrefix("PendingPatchSet", @PropertyDescriptors);
diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index c65aabdce..f4768b823 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -66,7 +66,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), - CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, &CreatePatches, ["PatchId"]), + CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, &CreatePatches, ["PatchId"]), ); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index c3022ae5b..116d105ee 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -85,7 +85,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 10), CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), - CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, &CreateRecords), + CreateDetailrefPropertyDescriptor("Records", "Records", &CreateRecords), ); SetDetailrefKeyPrefix("RecordGroup", @PropertyDescriptors);
diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 48d020949..07e60cd5b 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -241,7 +241,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("LogTime", "Timestamp traces (WINETEST_TIME)", !1, 1, "B", 1), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), - CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, &CreateTasks), + CreateDetailrefPropertyDescriptor("Tasks", "Tasks", &CreateTasks), ); SetDetailrefKeyPrefix("Step", @PropertyDescriptors); my @FlatPropertyDescriptors = ( diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 794c73eb7..2533c6a01 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -182,7 +182,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateBasicPropertyDescriptor("VMName", "VM", !1, 1, "A", 20), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, &CreateVMs, ["VMName"]), + CreateItemrefPropertyDescriptor("VM", "VM", 1, &CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("FileName", "File", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 8e9386299..5c5813cd9 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -355,7 +355,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("No", "Task", 1, 1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateBasicPropertyDescriptor("VMName", "VM", !1, 1, "A", 20), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, &CreateVMs, ["VMName"]), + CreateItemrefPropertyDescriptor("VM", "VM", 1, &CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index fcdbc8e04..90c4332c3 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -59,7 +59,7 @@ sub CreateItem($)
my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), - CreateItemrefPropertyDescriptor("Role", "Role", !1, 1, &CreateRoles, ["RoleName"]), + CreateItemrefPropertyDescriptor("Role", "Role", 1, &CreateRoles, ["RoleName"]), ); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index f2f2a199d..70d0d7b75 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -326,7 +326,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Password", "Password", !1, 1, "A", 49), CreateBasicPropertyDescriptor("RealName", "Real name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), - CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, &CreateUserRoles), + CreateDetailrefPropertyDescriptor("Roles", "Roles", &CreateUserRoles), ); SetDetailrefKeyPrefix("User", @PropertyDescriptors);