Import users action is working now.

diff --git a/Workspace/Siman/WebContent/sadmin/upload.jsp b/Workspace/Siman/WebContent/sadmin/upload.jsp
index 1bbfa64dab7aae7ce30c0de91ec3758523fb029d..6723844010bf4b7ddd4aa37bb78ec1140d80b4a9 100644 (file)
--- a/Workspace/Siman/WebContent/sadmin/upload.jsp
+++ b/Workspace/Siman/WebContent/sadmin/upload.jsp
@@ -26,13 +26,13 @@
               <tr height=10><td></td></tr>
               <s:hidden name="nextAction" value="%{nextAction}" />
               <s:hidden name="index"      value="%{index}" />
-              <s:file   name="upload" key="field.upload" onChange="enableUpload()" />
+              <s:file   name="upload" key="field.upload" onchange="enableUpload()" />
               <tr height=10><td></td></tr>
               <tr>
                 <td></td>
                 <td align=right>
-                  <input type="submit" name="cancel" value="<s:text name="button.cancel"/>"/>
-                  <input type="submit" name="doIt"   value="<s:text name="button.upload"/>" disabled="true"/>
+                    <s:submit theme="simple" name="cancel" key="button.cancel"/>
+                    <s:submit theme="simple" name="doIt" key="button.upload" disabled="true"/>
                 </td>
               </tr>
             </table>

diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java
index 4c0a974d44884447a467266cd2427f8474a7f37b..f2848e7d944334748d362379957c4a692014fdd9 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/Action.java
+++ b/Workspace/Siman/src/org/splat/simer/Action.java
@@ -393,12 +393,14 @@ public class Action extends ActionSupport implements ServletRequestAware,
 
                AbstractOpenObject entity = (AbstractOpenObject) _session.get(titleProperty + ".open");
 
-               getTitleBarSettings().setProgressState(
-                               entity.getProgressState().toString());
-               getTitleBarSettings().setSelectionState(entity.getSelection());
-               getTitleBarSettings().setEntryType(entity.getType().toLowerCase());
-               getTitleBarSettings().setEntryTypeTitle(entity.getType());
-               getTitleBarSettings().setEntryTitle(entity.getTitle());
+               if (entity != null) {
+                       getTitleBarSettings().setProgressState(
+                                       entity.getProgressState().toString());
+                       getTitleBarSettings().setSelectionState(entity.getSelection());
+                       getTitleBarSettings().setEntryType(entity.getType().toLowerCase());
+                       getTitleBarSettings().setEntryTypeTitle(entity.getType());
+                       getTitleBarSettings().setEntryTitle(entity.getTitle());
+               }
                getTitleBarSettings().setEditDisabledProperty(editDisabledProperty);
        }