svn: /web/php-rmtools/trunk/ docroot/rm/index.php template/menu.php
| From: | Pierre Joye | Date: | Tue, 12 Jan 2010 12:33:17 +0000 |
| Subject: | svn: /web/php-rmtools/trunk/ docroot/rm/index.php template/menu.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-6978@lists.php.net to get a copy of this message | ||
pajoye Tue, 12 Jan 2010 12:33:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293446
Log:
- don't display a link to the merge tool when no release branch exists. fix menu
Changed paths:
U web/php-rmtools/trunk/docroot/rm/index.php
U web/php-rmtools/trunk/template/menu.php
Modified: web/php-rmtools/trunk/docroot/rm/index.php
===================================================================
--- web/php-rmtools/trunk/docroot/rm/index.php 2010-01-12 12:30:29 UTC (rev 293445)
+++ web/php-rmtools/trunk/docroot/rm/index.php 2010-01-12 12:33:17 UTC (rev 293446)
@@ -17,17 +17,18 @@
$mode = filter_input(INPUT_GET, 'mode', FILTER_SANITIZE_STRING,
FILTER_FLAG_STRIP_LOW|FILTER_FLAG_STRIP_HIGH);
$title = $release_name;
-try {
- $svn = new rm\Storage($release_name);
-} catch (Exception $e) {
- $error = $e->getMessage();
- if ($json) {
- header('HTTP/1.0 500 Internal Error');
+if (!empty($mode) && $mode != 'menu') {
+ try {
+ $svn = new rm\Storage($release_name);
+ } catch (Exception $e) {
+ $error = $e->getMessage();
+ if ($json) {
+ header('HTTP/1.0 500 Internal Error');
+ }
+ $tpl = 'error.php';
+ $mode = 'error';
}
- $tpl = 'error.php';
- $mode = 'error';
}
-
switch ($mode) {
case 'list':
$nojs = filter_input(INPUT_GET, 'nojs', FILTER_VALIDATE_INT);
Modified: web/php-rmtools/trunk/template/menu.php
===================================================================
--- web/php-rmtools/trunk/template/menu.php 2010-01-12 12:30:29 UTC (rev 293445)
+++ web/php-rmtools/trunk/template/menu.php 2010-01-12 12:33:17 UTC (rev 293446)
@@ -4,8 +4,12 @@
<?php $release = $base->getRelease($release_name); ?>
<h2>Release <?php echo $release_name; ?><br /></h2>
<ul>
+<?php if ( $release['release_branch'] == $release['dev_branch']) { ?>
+<li>Merge mgt not availabe (no release branch).</li>
+<?php } else { ?>
<li><a href="index.php?mode=list&release=<?php echo $release_name;
?>">Merges (updated on <?php echo
$release['last_update'];?>)</a></li>
<li><a href="index.php?mode=list&nojs=1">Merges (no
js)</a></li>
+<?php } ?>
<li><a href="">Builds</a></li>
</ul>
<?php } ?>