July 2009 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : note: Improve logic in object{Get, Set}Parent
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: e07acae8d9bbf4506058be3e67cbab90eda95ec2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e07acae8d9bbf4506058be3e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 20:47:42 2009 +0200 note: Improve logic in object{Get,Set}Parent --- include/note.php | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/note.php b/include/note.php index 754e585..4233ac3 100644 --- a/include/note.php +++ b/include/note.php @@ -331,6 +331,11 @@ class Note { return $iVersionId > 0; } + public function hasRealVersionId() + { + return note::isRealVersionId($this->iVersionId); + } + function outputEditor($aValues = null) { if($aValues) @@ -493,7 +498,7 @@ class Note { public function objectGetParent($sClass = '') { - if($this->iVersionId) + if($this->hasRealVersionId()) return new version($this->iVersionId); else return new application($this->iAppId); @@ -501,7 +506,7 @@ class Note { public function objectSetParent($iNewId, $sClass = '') { - if($this->iVersionId) + if($this->hasRealVersionId()) $this->iVersionId = $iNewId; else $this->iAppId = $iNewId;

1 0

Alexander Nicolaysen Sørnes : application: Use consistent capitalization for buttons
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: fefb74d1acde3d1d71260ced9b5d379ed80cce2c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fefb74d1acde3d1d71260ced… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 20:53:29 2009 +0200 application: Use consistent capitalization for buttons --- include/application.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/application.php b/include/application.php index 06ef247..4112c0b 100644 --- a/include/application.php +++ b/include/application.php @@ -834,7 +834,7 @@ class Application { if($_SESSION['current']->isSuperMaintainer($this->iAppId) || $_SESSION['current']->hasPriv("admin")) { - echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit Application" class="button"></form>'; + echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit application" class="button"></form>'; echo '<form method="post" action="objectManager.php?sClass=note&sAction=add&sTitle=Add+note&iAppId='.$this->iAppId.'&sNoteTitle=HOWTO&sReturnTo='.urlencode($this->objectMakeUrl()).'">'; echo '<input type="submit" value="Add note/how-to" />'; echo '</form>'; @@ -850,8 +850,8 @@ class Application { if($_SESSION['current']->hasPriv("admin")) { $url = BASE."objectManager.php?sClass=application&bIsQueue=false&sAction=delete&iId=".$this->iAppId; - echo " <form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete App\" class=\"button\"></form>"; - echo ' <form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit Bundle" class="button"></form>'; + echo " <form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete app\" class=\"button\"></form>"; + echo ' <form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit bundle" class="button"></form>'; } } else {

1 0

Maik Schulz : Website: fixes to german translation of the about page
by Maik Schulz 29 Jul '09

29 Jul '09

Module: website Branch: master Commit: 95d8820546700005f5c9d1700783246a954dd658 URL: http://source.winehq.org/git/website.git/?a=commit;h=95d8820546700005f5c9d1… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Wed Jul 29 19:14:00 2009 +0200 Website: fixes to german translation of the about page --- templates/de/about.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 245eace..3a89d7f 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -11,14 +11,14 @@ <p>Wine wird immer <a href="" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> -<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)<a/> zur Dokumentation davon, wie gut einzelne Programme funktionieren und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> +<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> zur Dokumentation davon, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> <h2>Erfahre mehr:</h2> <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen entlarvt (en)</a></li> - <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts</a></li> - <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts (en)</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung (en)</a></li> </ul> <hr />

1 0

Maik Schulz : Website: update german translations based on Scott's changes
by Maik Schulz 29 Jul '09

29 Jul '09

Module: website Branch: master Commit: bf62e9e87678f53992ad8d5ffbb50c7daeea70a9 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf62e9e87678f53992ad8d… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Wed Jul 29 19:06:52 2009 +0200 Website: update german translations based on Scott's changes --- templates/de/about.template | 60 +++++++++------------------------ templates/de/acknowledgement.template | 7 ---- templates/de/home.template | 16 ++++---- 3 files changed, 24 insertions(+), 59 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index c79e903..245eace 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -1,52 +1,24 @@  - + <h1 class="title">Über Wine</h1> -<p>Wine ist eine Übersetzungsschicht (ein Programm Loader), die in -der Lage ist, Windows-Anwendungen unter Linux und anderen POSIX-kompatiblen -Betriebssystemen laufen zu lassen. Windows-Anwendungen verhalten sich unter -Wine so wie native Programme: ohne die Geschwindigkeitseinbußen oder -erhöhten Speicheranforderungen eines Emulators und mit einem Look & Feel, -das mit anderen Anwendungen auf Deinem Desktop vergleichbar ist.</p> - -<p>Das Wine-Projekt wurde 1993 mit dem Ziel, Windows 3.1 Anwendungen unter -Linux laufen zu lassen, begonnen. Bob Amstadt war der ursprüngliche -Koordinator. Er übergab das Projekt jedoch recht früh an Alexandre -Julliard, der es seitdem führt. Im Laufe der Jahre wurden Umsetzungen -für andere Unix-Varianten hinzugefügt; darüberhinaus -Unterstützung für Win32 als Win32-Anwendungen populär wurden. -</p> - -<p>Wine ist immernoch in Entwicklung und ist noch nicht für den -generellen Gebrauch geeignet. Unabhängig davon finden es viele Leute -nützlich um eine steigende Zahl von Windows-Programmen zu verwenden. -In der <a href="http://appdb.winehq.org/">AppDB (en)</a> -findest Du Erfolgs- und Misserfolgsmeldungen für hunderte von -Windows-Anwendungen, in <a href="http://bugs.winhq.org/">Bugzilla -(en)</a> eine Liste der bekannten Probleme und auf der <a -href="{$root}/status">Status</a>-Seite einen Überblick über den -Entwicklungsfortschritt von Wine.</p> - -<p>Eine große Gruppe von Wine-Entwicklern kannst Du in den <a -href="{$root}/forums">Wine-Foren</a> erreichen. Kommentare zur winehq.org -Website können an <a -href="mailto:web-admin_at_winehq.org">web-admin_at_winehq.org</a> gemailt -werden. Alexandre Julliard ist der Leiter des Wine-Projekts und kann per -E-Mail unter <a -href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a> -erreicht werden.</p> - -<p>Wir haben außerdem eine kurze Übersicht zusammengestellt, -die Dir hilft, das Projekt besser zu verstehen:</p> +<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> + +<p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="http://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender</a> nutzen Wine, um ihre Programme zu verwenden.</p> + +<h2>Open Source und benutzergetrieben</h2> + +<p>Wine wird immer <a href="" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> + +<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)<a/> zur Dokumentation davon, wie gut einzelne Programme funktionieren und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> + +<h2>Erfahre mehr:</h2> <ul> - <li><a href="{$root}/history">Die Geschichte von Wine</a></li> - <li><a href="{$root}/why">Warum Wine so wichtig ist</a></li> - <li><a href="{$root}/myths">Wine-Mythen entlarvt</a></li> - <li><a href="{$root}/wine_features">Wines Features</a></li> - <li><a href="{$root}/acknowledgement">Danksagungen</a></li> - <li><a href="{$root}/wwn">World Wine News (en)</a></li> - <li><a href="{$root}/interview">Interviews</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen entlarvt (en)</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung</a></li> </ul> <hr /> diff --git a/templates/de/acknowledgement.template b/templates/de/acknowledgement.template index 9b94aba..cd8e4b9 100644 --- a/templates/de/acknowledgement.template +++ b/templates/de/acknowledgement.template @@ -207,10 +207,3 @@ haben, die schwierige Probleme angehen... wir schon.</p> <p>Eine vollständige Liste der <a href="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=AUTHORS">Autoren</a> kann im Quellcode Repository gefunden werden.</p> -<hr /> - -<div class="link-container"> - <p class="left-link"><a href="{$root}/wine_features">Zurück</a>: Wine Features</p> - <p class="right-link">World Wine News (en): <a href="{$root}/wwn">Weiter</a></p> -</div> - diff --git a/templates/de/home.template b/templates/de/home.template index 95bc384..fd17c03 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -10,23 +10,23 @@ <ul class="winehq_menu"> <li class="info" onClick="document.location='{$root}/about/';"> - <div class="title"><a href="{$root}/about/">Information</a></div> - <div class="subtitle">Überblick über Wines Features.</div> + <div class="title"><a href="{$root}/about/">Über</a></div> + <div class="subtitle">Erfahre mehr über das Wine-Projekt.</div> </li> <li class="dl" onClick="document.location='{$root}/download/';"> - <div class="title"><a href="{$root}/download/">Download</a></div> - <div class="subtitle">Hol Dir Wine!</div> + <div class="title"><a href="{$root}/download/">Hol Dir Wine</a></div> + <div class="subtitle">Installiere die aktuellste Wine-Version.</div> </li> <li class="help" onClick="document.location='{$root}/help/';"> - <div class="title"><a href="{$root}/help/">Hilfe!</a></div> - <div class="subtitle">Dokumentation, Unterstützung und Wiki.</div> + <div class="title"><a href="{$root}/help/">Unterstützung</a></div> + <div class="subtitle">Hol Dir Hilfe zum Benutzen von Wine.</div> </li> <li class="devel" onClick="document.location='{$root}/devel/';"> <div class="title"><a href="{$root}/devel/">Entwicklung</a></div> - <div class="subtitle">Wine Quellcode, Bug Tracking, usw.</div> + <div class="subtitle">Werde ein Wine-Entwickler.</div> </li> <li class="donate" onClick="document.donateForm.submit();"> @@ -36,7 +36,7 @@ <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> - <div class="subtitle">Spende für Wine.</div> + <div class="subtitle">Spende dem Wine-Projekt.</div> </li> </ul>

1 0

Alexander Nicolaysen Sørnes : note: Show app notes above version notes
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: b5e4093097c36f92e3404fbeee6b61fae552f3a2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b5e4093097c36f92e3404fbe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 17:54:18 2009 +0200 note: Show app notes above version notes --- include/note.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index 315d627..754e585 100644 --- a/include/note.php +++ b/include/note.php @@ -286,7 +286,7 @@ class Note { { $oVersion = new version($iVersionId); $oApp = $oVersion->objectGetParent(); - $hResult = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?' OR (appId = '?' AND (versionId = '?' OR versionId = '?'))", $iVersionId, $oApp->objectGetId(), APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS); + $hResult = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?' OR (appId = '?' AND (versionId = '?' OR versionId = '?')) ORDER BY versionId,noteId", $iVersionId, $oApp->objectGetId(), APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS); } else if($iAppId) { $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND (versionId = '?' OR versionId = '?')", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP);

1 0

Alexander Nicolaysen Sørnes : note: Add missing parentheses to SQL query
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: 46e3f876cf90effc0f01c81e034a16513fa5fd3b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=46e3f876cf90effc0f01c81e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 17:41:20 2009 +0200 note: Add missing parentheses to SQL query --- include/note.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index 5074bb9..315d627 100644 --- a/include/note.php +++ b/include/note.php @@ -289,7 +289,7 @@ class Note { $hResult = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?' OR (appId = '?' AND (versionId = '?' OR versionId = '?'))", $iVersionId, $oApp->objectGetId(), APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS); } else if($iAppId) { - $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND versionId = '?' OR versionId = '?'", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP); + $hResult = query_parameters("SELECT noteId FROM appNotes WHERE appId = '?' AND (versionId = '?' OR versionId = '?')", $iAppId, APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_APP); } if(!$hResult)

1 0

Alexander Nicolaysen Sørnes : note: Fix e-mail test when moving from version to app
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: bb050bc04045e830ca1c63d2fceaad943a1c004a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bb050bc04045e830ca1c63d2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 17:33:41 2009 +0200 note: Fix e-mail test when moving from version to app --- include/note.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/note.php b/include/note.php index 0161b73..5074bb9 100644 --- a/include/note.php +++ b/include/note.php @@ -121,17 +121,17 @@ class Note { $this->iVersionId, $this->iNoteId)) return false; - $sVersionBefore = Version::lookup_name($oNote->iVersionId); - if(!$this->iAppId) { + $sVersionBefore = Version::lookup_name($oNote->iVersionId); $sVersionAfter = Version::lookup_name($this->iVersionId); $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; } else { $oApp = new application($this->iAppId); $sNewApp = $oApp->sName; - $sWhatChanged .= "Moved from version $shVersionBefore to application $sNewApp"; + $sVersionBefore = version::fullName($oNote->iVersionId); + $sWhatChanged .= "Moved from version $sVersionBefore to application $sNewApp.\n\n"; } } if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId)

1 0

Alexander Nicolaysen Sørnes : note: Remove reference to undefined variable
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: 9b9d3378aa45140c8da3e9128c68cae5fee3343c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9b9d3378aa45140c8da3e912… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 16:34:02 2009 +0200 note: Remove reference to undefined variable --- include/note.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index 9b0e8fb..0161b73 100644 --- a/include/note.php +++ b/include/note.php @@ -356,7 +356,7 @@ class Note { HtmlAreaLoaderScript(array("editor")); - echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0); + echo html_frame_start("Edit Application Note", "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); echo '<input type="hidden" name="bEditing" value="true">';

1 0

Alexander Nicolaysen Sørnes : note: Fix a warning when editing notes
by Alexander Nicolaysen Sørnes 29 Jul '09

29 Jul '09

Module: appdb Branch: master Commit: c3beccd38dcb2c13b27ebb4166a4c03a8b4f11c3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c3beccd38dcb2c13b27ebb41… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 29 16:32:37 2009 +0200 note: Fix a warning when editing notes --- include/note.php | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/note.php b/include/note.php index fec4edf..9b0e8fb 100644 --- a/include/note.php +++ b/include/note.php @@ -333,11 +333,17 @@ class Note { function outputEditor($aValues = null) { - if(!$this->iVersionId) - $this->iVersionId = getInput('iVersionId', $aValues); + if($aValues) + { + if(!$this->iVersionId) + $this->iVersionId = getInput('iVersionId', $aValues); - if(!$this->iAppId) - $this->iAppId = getInput('iAppId', $aValues); + if(!$this->iAppId) + $this->iAppId = getInput('iAppId', $aValues); + + if(!$this->sTitle) + $this->sTitle = getInput('sNoteTitle', $aValues); + } if($this->iAppId && !$this->iVersionId) $this->iVersionId = APPNOTE_SHOW_FOR_ALL; @@ -348,9 +354,6 @@ class Note { $this->iAppId = $oVersion->iAppId; } - if(!$this->sTitle) - $this->sTitle = getInput('sNoteTitle', $aValues); - HtmlAreaLoaderScript(array("editor")); echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0);

1 0

Alexander Nicolaysen Sørnes : note: Allow moving from version to app
by Alexander Nicolaysen Sørnes 28 Jul '09

28 Jul '09

Module: appdb Branch: master Commit: b4bae2f9fe749ee8288307ec0876d7e33048681d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b4bae2f9fe749ee8288307ec… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Jul 29 03:10:00 2009 +0200 note: Allow moving from version to app --- include/note.php | 79 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 60 insertions(+), 19 deletions(-) diff --git a/include/note.php b/include/note.php index bde0e77..fec4edf 100644 --- a/include/note.php +++ b/include/note.php @@ -115,14 +115,30 @@ class Note { $sWhatChanged .= "Description was changed from\n ".$oNote->shDescription."\n to \n".$this->shDescription.".\n\n"; } - if ($this->iVersionId && $this->iVersionId!=$oNote->iVersionId) + if (($this->iVersionId || $this->iAppId) && $this->iVersionId!=$oNote->iVersionId) { if (!query_parameters("UPDATE appNotes SET versionId = '?' WHERE noteId = '?'", $this->iVersionId, $this->iNoteId)) return false; + $sVersionBefore = Version::lookup_name($oNote->iVersionId); - $sVersionAfter = Version::lookup_name($this->iVersionId); - $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; + + if(!$this->iAppId) + { + $sVersionAfter = Version::lookup_name($this->iVersionId); + $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; + } else + { + $oApp = new application($this->iAppId); + $sNewApp = $oApp->sName; + $sWhatChanged .= "Moved from version $shVersionBefore to application $sNewApp"; + } + } + if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId) + { + if(!query_parameters("UPDATE appNotes SET appId = '?' WHERE noteId = '?'", + $this->iAppId, $this->iNoteId)) + return false; } if($sWhatChanged) $this->SendNotificationMail("edit",$sWhatChanged); @@ -310,23 +326,31 @@ class Note { } } + public static function isRealVersionId($iVersionId) + { + return $iVersionId > 0; + } + function outputEditor($aValues = null) { - if($aValues) - { - if(!$this->iVersionId) - $this->iVersionId = $aValues['iVersionId']; + if(!$this->iVersionId) + $this->iVersionId = getInput('iVersionId', $aValues); - if(!$this->iAppId) - $this->iAppId = getInput('iAppId', $aValues); + if(!$this->iAppId) + $this->iAppId = getInput('iAppId', $aValues); - if($this->iAppId && !$this->iVersionId) - $this->iVersionId = APPNOTE_SHOW_FOR_ALL; + if($this->iAppId && !$this->iVersionId) + $this->iVersionId = APPNOTE_SHOW_FOR_ALL; - if(!$this->sTitle) - $this->sTitle = $aValues['sNoteTitle']; + if(!$this->iAppId) + { + $oVersion = new version($this->iVersionId); + $this->iAppId = $oVersion->iAppId; } + if(!$this->sTitle) + $this->sTitle = getInput('sNoteTitle', $aValues); + HtmlAreaLoaderScript(array("editor")); echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0); @@ -334,8 +358,7 @@ class Note { echo '<input type="hidden" name="bEditing" value="true">'; echo '<input type="hidden" name="iNoteId" value="'.$this->iNoteId.'">'; - if(!$this->iAppId) - echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; + echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">'; echo '<tr><td class=color1>Title</td>'."\n"; @@ -345,14 +368,28 @@ class Note { echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; - if($this->iAppId) + + if($this->iAppId); + $oApp = new application($this->iAppId); + if($this->iAppId || $oApp->canEdit()) { - $aIds = array(APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS, APPNOTE_SHOW_FOR_APP); - $aOptions = array('Show on both application and version pages', 'Show on version pages only', 'Show on application page only'); + $aIds = array(); + $aOptions = array(); + if($this->isRealVersionId($this->iVersionId)) + { + $aIds[] = $this->iVersionId; + $aOptions[] = 'Show for this version only'; + } + $aIds = array_merge($aIds, array(APPNOTE_SHOW_FOR_ALL, APPNOTE_SHOW_FOR_VERSIONS, APPNOTE_SHOW_FOR_APP)); + $aOptions = array_merge($aOptions, array('Show on both application and version pages', 'Show on all version pages only', 'Show on application page only'));; echo '<tr><td class="color1">Display mode</td>'."\n"; echo '<td class="color0">'.html_radiobuttons($aIds, $aOptions, 'iVersionId', $this->iVersionId); echo '</td></tr>'; + } else if(!$this->iAppId) + { + echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; } + echo '<tr><td colspan="2" align="center" class="color3">',"\n"; echo html_table_end(); @@ -364,7 +401,11 @@ class Note { function GetOutputEditorValues($aValues) { $this->iVersionId = getInput('iVersionId', $aValues); - $this->iAppId = getInput('iAppId', $aValues); + + if(!$this->isRealVersionId($this->iVersionId)) + $this->iAppId = getInput('iAppId', $aValues); + else + $this->iAppId = 0; $this->sTitle = $aValues['sNoteTitle']; $this->shDescription = $aValues['shNoteDesc']; }

1 0