incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r451311 - in /incubator/lokahi/lokahi/trunk/src: java/org/apache/lokahi/core/api/instance/InstanceModel.java www/Core/Instance/update.vm
Date Fri, 29 Sep 2006 14:32:24 GMT
Author: toback
Date: Fri Sep 29 07:32:23 2006
New Revision: 451311

URL: http://svn.apache.org/viewvc?view=rev&rev=451311
Log:
Re:

http://mail-archives.apache.org/mod_mbox/incubator-lokahi-dev/200609.mbox/%3c451B0BF4.3050604@free.fr%3e

Modified:
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/InstanceModel.java
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/InstanceModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/InstanceModel.java?view=diff&rev=451311&r1=451310&r2=451311
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/InstanceModel.java
(original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/InstanceModel.java
Fri Sep 29 07:32:23 2006
@@ -6,9 +6,9 @@
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
-* 
+*
 *   http://www.apache.org/licenses/LICENSE-2.0
-* 
+*
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -63,7 +63,7 @@
   public void updateInstance(User u, Instance i, Function f) throws AuthorizationException,
TMCIllegalArgumentException, SQLException, IOException {
     this.jpInit(f, u, i.getName());
     if (u.isAllowed(f) && "UpdateInstance".equals(f.getCommand())) {
-      if (i.getPk() > 1 && i.getName() != null && !"".equals(i.getName()))
{
+      if (i.getPk() >= 1 && i.getName() != null && !"".equals(i.getName()))
{
         Instance.update(i);
       } else {
         throw new TMCIllegalArgumentException("Instance can not be null");

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm?view=diff&rev=451311&r1=451310&r2=451311
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm Fri Sep 29 07:32:23 2006
@@ -60,7 +60,7 @@
       #if ($User.isAllowed("UpdateInstance") && $methodToCall == "UpdateInstance")
       #set ($instance = $view.getInstance($id))
       <form name="Form" method="post" action='$link.setAction("administration/InstanceAction")'>
-        <input type="hidden" id="id" name="id" value="$!{id}">
+        <input type="hidden" id="instanceId" name="instanceId" value="$!{id}">
         <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
 
         Name: <input type="text" readonly id="instanceName" name="instanceName" value="$!{instance.getName()}"><br
/>



Mime
View raw message