From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 22 Jul 2010 09:56:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plewww
X-Git-Tag: plewww-4.3-48~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d31fa31bc2efa20a4ce0d8285f7d8f607eff5812;hp=1b6b91e7064e12c9c3f26e58fd5a396f2a8a8fa8;p=plewww.git

Merge branch 'master' of ssh://git.onelab.eu/git/plewww
---

diff --git a/planetlab/sites/site_form.php b/planetlab/sites/site_form.php
index 6e69437..e6b41d8 100644
--- a/planetlab/sites/site_form.php
+++ b/planetlab/sites/site_form.php
@@ -73,7 +73,7 @@ EOF;
 
   $form['address:line1'] = array('title' => 'Address', 'required' => FALSE,
 				 'maxlength' => 40, 'size' => 30,
-				 'comment' => '<strong>Postal address</strong> (can be left blank)');
+				 'comment' => '<strong>Postal address</strong>');
   $form['address:line2'] = array('title' => 'Address (2)', 'required' => FALSE,
 				 'maxlength' => 40, 'size' => 30);
   $form['address:line3'] = array('title' => 'Address (3)', 'required' => FALSE,
diff --git a/planetlab/tags/nodegroups.php b/planetlab/tags/nodegroups.php
index 82bac8c..feb56a5 100644
--- a/planetlab/tags/nodegroups.php
+++ b/planetlab/tags/nodegroups.php
@@ -53,7 +53,6 @@ plekit_linetabs($tabs);
 
 if ( ! $nodegroups ) {
   drupal_set_message ('No node group found');
-  return;
  }
   
 $headers=array();
diff --git a/plewww.spec b/plewww.spec
index 27e2360..5e0044a 100644
--- a/plewww.spec
+++ b/plewww.spec
@@ -5,7 +5,7 @@
 # what the myplc rpm requires
 %define name plewww
 %define version 4.3
-%define taglevel 46
+%define taglevel 47
 
 # no need to mention pldistro as this module differs in both distros
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/plekit
 
 %changelog
+* Tue Jul 06 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - plewww-4.3-47
+- show nodegroups form to add new groups
+
 * Wed Jun 16 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - plewww-4.3-46
 - just tagging plewww again to test module-tag on git