AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM
2016-07-01 09:00:11 +02:00
parent fa66fe01eb df29fa21f9
commit d47d0a9f95
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organiser/ClassControlValues.vb
View File

@@ -761,7 +761,7 @@ Public Class ClassControlValues
vorgabe = defaultValue.Replace("@FORM_ID", CURRENT_FORM_ID)
vorgabe = vorgabe.Replace("@RECORD_ID", CURRENT_RECORD_ID)
vorgabe = vorgabe.Replace("@RECORDID", CURRENT_RECORD_ID)
vorgabe = vorgabe.Replace("@PARENTRECORD_ID", CURRENT_PARENT_ENTITY_ID)
vorgabe = vorgabe.Replace("@PARENTRECORD_ID", CURRENT_PARENT_RECORD_ID)
defaultValue = ClassDatabase.Execute_Scalar(vorgabe.ToString, True)
If IsNothing(vorgabe) Then
textbox.Text = ""

16
app/SetupWiX/Product.wxs
View File

@@ -2,7 +2,21 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
<Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
<Package
Id="*"
Keywords="Installer"
Description="Digital Data Record Organizer Setup"
Comments="Record Organizer is a registered Trademark of Digital Data"
Manufacturer="Digital Data"
InstallerVersion="100"
Languages="1031"
Compressed="yes"
SummaryCodepage="1252"
InstallScope="perMachine"
/>
<!--
InstallScrope="perMachine" - sorgt dafür, dass das Programm für jeden Benutzer installiert wird
-->
<!-- Nicht entfernen! -->
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />