fixed iob
This commit is contained in:
parent
a421e5297a
commit
e07344417c
3 changed files with 14 additions and 3 deletions
|
|
@ -28,6 +28,7 @@
|
||||||
- The upgrade script now wipes out the file cache in case it would cause
|
- The upgrade script now wipes out the file cache in case it would cause
|
||||||
any conflicts.
|
any conflicts.
|
||||||
- fix [ 1373319 ] archive
|
- fix [ 1373319 ] archive
|
||||||
|
- Fixed the In/Out Board so it doesn't produce fatal errors on add.
|
||||||
- fix [ 1373493 ] Upgrade script fails because parameters are not quoted
|
- fix [ 1373493 ] Upgrade script fails because parameters are not quoted
|
||||||
- Upgrade now uses --results-file parameter on mysqldump because some
|
- Upgrade now uses --results-file parameter on mysqldump because some
|
||||||
operating system don't handle UTF-8 characters through their pipes.
|
operating system don't handle UTF-8 characters through their pipes.
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,17 @@ fixCSFaqTemplateAnchors();
|
||||||
updateProfileSystem();
|
updateProfileSystem();
|
||||||
convertDashboardPrefs();
|
convertDashboardPrefs();
|
||||||
fixPosts();
|
fixPosts();
|
||||||
|
fixIOB();
|
||||||
|
|
||||||
finish(); # this line required
|
finish(); # this line required
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------
|
||||||
|
sub fixIOB {
|
||||||
|
print "\tFixing IOB.\n" unless ($quiet);
|
||||||
|
WebGUI::SQL->write("alter table InOutBoard_statusLog add column createdBy varchar(22) binary");
|
||||||
|
}
|
||||||
|
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
sub fixPosts {
|
sub fixPosts {
|
||||||
print "\tFixing posts.\n" unless ($quiet);
|
print "\tFixing posts.\n" unless ($quiet);
|
||||||
|
|
|
||||||
|
|
@ -229,12 +229,14 @@ InOutBoard_status.status,
|
||||||
InOutBoard_status.dateStamp,
|
InOutBoard_status.dateStamp,
|
||||||
c.fieldData as department,
|
c.fieldData as department,
|
||||||
groupings.groupId
|
groupings.groupId
|
||||||
from users, InOutBoard, groupings
|
from users
|
||||||
|
left join groupings on groupings.userId=users.userId
|
||||||
|
left join InOutBoard on groupings.groupId=InOutBoard.inOutGroup
|
||||||
left join userProfileData a on users.userId=a.userId and a.fieldName='firstName'
|
left join userProfileData a on users.userId=a.userId and a.fieldName='firstName'
|
||||||
left join userProfileData b on users.userId=b.userId and b.fieldName='lastName'
|
left join userProfileData b on users.userId=b.userId and b.fieldName='lastName'
|
||||||
left join userProfileData c on users.userId=c.userId and c.fieldName='department'
|
left join userProfileData c on users.userId=c.userId and c.fieldName='department'
|
||||||
left join InOutBoard_status on users.userId=InOutBoard_status.userId and InOutBoard_status.assetId=".quote($self->getId())."
|
left join InOutBoard_status on users.userId=InOutBoard_status.userId and InOutBoard_status.assetId=".quote($self->getId())."
|
||||||
where users.userId<>'1' and groupings.groupId=InOutBoard.inOutGroup and groupings.userId=users.userId and InOutBoard.inOutGroup=".quote($self->get("inOutGroup"))."
|
where users.userId<>'1' and InOutBoard.inOutGroup=".quote($self->get("inOutGroup"))."
|
||||||
group by userId
|
group by userId
|
||||||
order by department, lastName, firstName";
|
order by department, lastName, firstName";
|
||||||
|
|
||||||
|
|
@ -447,7 +449,8 @@ InOutBoard_statusLog.dateStamp,
|
||||||
InOutBoard_statusLog.createdBy,
|
InOutBoard_statusLog.createdBy,
|
||||||
c.fieldData as department,
|
c.fieldData as department,
|
||||||
groupings.groupId
|
groupings.groupId
|
||||||
from users, InOutBoard, groupings
|
from users
|
||||||
|
left join groupings on groupings.userId=users.userId
|
||||||
left join userProfileData a on users.userId=a.userId and a.fieldName='firstName'
|
left join userProfileData a on users.userId=a.userId and a.fieldName='firstName'
|
||||||
left join userProfileData b on users.userId=b.userId and b.fieldName='lastName'
|
left join userProfileData b on users.userId=b.userId and b.fieldName='lastName'
|
||||||
left join userProfileData c on users.userId=c.userId and c.fieldName='department'
|
left join userProfileData c on users.userId=c.userId and c.fieldName='department'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue