Changeset 20541

Show
Ignore:
Timestamp:
03/08/10 10:24:35 (5 months ago)
Author:
umesha
Message:

changes for workflow steps notification
some UI changes for Edit notification page

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/src/net/project/workflow/SelectListBean.java

    r18397 r20541  
    370370                subscription.setTargetObjectID(this.currentStepID); 
    371371                subscription.addNotificationType(Step.ENTER_EVENT_ID); 
     372                subscription.setStatus(true); 
    372373            } 
    373374            subscription.setUser(this.user); 

  • trunk/core/web/jsp/notification/EditSubscription.jsp

    r20534 r20541  
    4848        String spaceParticipantList = StringUtils.EMPTY; 
    4949        String itemName = StringUtils.EMPTY; 
    50         boolean status; 
     50        boolean status = false; 
    5151        DateFormat dateFormatInstance = DateFormat.getInstance(); 
    5252        if(!((request.getParameter("theAction")!= null) && (request.getParameter("theAction").equals("next")))){ 
    …… 
    9191<%-- Avinash: bfd 3140  External Email Addresses in Create/Modify suscription is not validated --%>      
    9292        document.getElementById("txt").innerHTML='<%=PropertyProvider.get("prm.notification.editsubscription.separate.text")%>'; 
    93         focusFirstField(theForm); 
     93        focus(theForm, 'name'); 
    9494        } 
    9595 
    …… 
    109109         
    110110        function validateForm(theForm) { 
     111                var notificationType = document.getElementsByName('notificationType'); 
    111112                if (!checkTextbox(theForm.name,'<%=PropertyProvider.get("prm.notification.editsubscription.namerequired.message")%>'))  
    112113                        return false; 
    113                 if (!checkCheckBox_NoSelect(theForm.notificationType,'<%=PropertyProvider.get("prm.notification.createsubscription2.actiontonotifiedrequired.message")%>'))  
    114                         return false; 
    115  
    116                 <% if (securityProvider.isUserSpaceAdministrator()) { %> 
     114                if((notificationType.length == 1) && (!notificationType[0].checked)){ 
     115                        extAlert('<%=PropertyProvider.get("prm.resource.global.exterroralert.title")%>', '<%=PropertyProvider.get("prm.notification.createsubscription2.actiontonotifiedrequired.message")%>', Ext.MessageBox.ERROR); 
     116                        return false; 
     117                }  
     118                if(notificationType.length > 1 && !checkCheckBox_NoSelect(theForm.notificationType,'<%=PropertyProvider.get("prm.notification.createsubscription2.actiontonotifiedrequired.message")%>')){  
     119                        return false; 
     120                } 
     121        <% if (securityProvider.isUserSpaceAdministrator()) { %> 
    117122                if(!checkExternalEmailList()) return false; 
    118123                <%}%> 
    …… 
    184189        <input type="hidden" name="spaceID" value="<%=request.getParameter("spaceID")%>"> 
    185190         
    186 <table width="95%" border="0" cellspacing="0" cellpadding="0"> 
     191<table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    187192 
    188193    <tr> 
    189         <td nowrap colspan="4" class="editNotifyHeader"><%=PropertyProvider.get("prm.notification.editsubscription.channel.edit.title")%> 
    190         </td> 
     194        <td nowrap colspan="3" class="editNotifyHeader"><%=PropertyProvider.get("prm.notification.editsubscription.channel.edit.title")%> 
     195        </td> 
     196        <td width="3%">&nbsp;</td> 
    191197    </tr> 
    192198    <tr valign="top"> 
    193         <td colspan="4" class="channelContent">&nbsp;</td> 
     199        <td colspan="3" class="channelContent">&nbsp;</td> 
    194200    </tr> 
    195201 
    …… 
    197203    <tr> 
    198204        <td width="2%">&nbsp;</td> 
    199         <td colspan="3"> 
     205        <td colspan="2"> 
    200206 
    201207<%-- Insert table containing editSubscription form --%> 
    …… 
    204210                <td class="editTableContent" width="18%"><%=PropertyProvider.get("prm.notification.editsubscription.status.label")%></td> 
    205211                <td class="tableContent" ><input type="radio" 
    206                         id="status" name="status" value="true" <%= status ? "checked" : "" %>><%=PropertyProvider.get("prm.notification.editsubscription.statusenable.label")%></input> 
    207                         &nbsp&nbsp&nbsp&nbsp 
    208                         <input type="radio" id="status" name="status" value="false" <%= status ? "" : "checked" %>><%=PropertyProvider.get("prm.notification.editsubscription.statusdisable.label")%></input> 
     212                        id="status" name="status" value="true" <%= status ? "checked" : "" %>/><%=PropertyProvider.get("prm.notification.editsubscription.statusenable.label")%> 
     213                        &nbsp;&nbsp;&nbsp; 
     214                        <input type="radio" id="status" name="status" value="false" <%= status ? "" : "checked" %>/><%=PropertyProvider.get("prm.notification.editsubscription.statusdisable.label")%> 
    209215                </td> 
    210216        </tr> 
    …… 
    227233        <td class="notifyFieldRequired"><%=PropertyProvider.get("prm.notification.editsubscription.name.label")%></td> 
    228234        <td class="tableContent">  
    229             <input type="text" name="name" value='<c:out value="${editSubscription.name}"/>' size="60" maxlength="60" class="elementBorder notifyTextbox"> 
     235            <input type="text" name="name" value='<c:out value="${editSubscription.name}"/>' class="elementBorder notifyTextbox"> 
    230236        </td> 
    231237    </tr> 
    …… 
    233239    <tr>  
    234240        <td class="editTableContent"><%=PropertyProvider.get("prm.notification.editsubscription.description.label")%></td> 
    235         <td class="tableContent"><input type="text" name="description" class="elementBorder notifyTextbox" value='<c:out value="${editSubscription.description}"/>' size="60" maxlength="60"></td> 
    236     </tr> 
    237  
    238     <tr>  
    239         <td class="notifyFieldRequired" valign="top" colspan="2"><%=PropertyProvider.get("prm.notification.editsubscription.itemsnotified.label")%></td> 
     241        <td class="tableContent"><textarea rows="5" name="description" class="elementBorder notifyTextbox"><c:out value="${editSubscription.description}"/></textarea></td> 
     242    </tr> 
     243 
     244    <tr>  
     245        <td class="notifyFieldRequired" valign="top"><%=PropertyProvider.get("prm.notification.editsubscription.itemsnotified.label")%></td> 
     246        <td>&nbsp;</td> 
    240247        </tr> 
    241248 
    …… 
    263270        </tr> 
    264271    <tr>  
    265         <td class="notifyFieldRequired" valign="top" colspan="4"><%=PropertyProvider.get("prm.notification.editsubscription.actionnotified.label")%></td> 
     272        <td class="notifyFieldRequired" valign="top" ><%=PropertyProvider.get("prm.notification.editsubscription.actionnotified.label")%></td> 
     273        <td>&nbsp;</td> 
    266274        </tr> 
    267275        <%=editSubscription.getEventSubscribeCheckList(id)%> 
    …… 
    305313                                <td> 
    306314                                <%-- Avinash: bfd 3140  External Email Addresses in Create/Modify suscription is not validated --%> 
    307                                     <input type="text" class="elementBorder notifyTextbox" id="otherEmail" name="otherEmail" value='<c:out value="${editSubscription.externalSubscribersInCSV}"/>' size="60" onblur="return checkExternalEmailList();" /> 
     315                                    <input type="text" class="elementBorder notifyTextbox" id="otherEmail" name="otherEmail" value='<c:out value="${editSubscription.externalSubscribersInCSV}"/>' onblur="return checkExternalEmailList();" /> 
    308316                                </td> 
    309317                            </tr> 
    …… 
    334342        <%-- End Subscription form table --%> 
    335343                <tr> 
    336                 <td align="center" colspan="4" class="notify-edit-bottom" height="40"><button type="button" style="width: 100px;" onClick="return finish();"> <%=PropertyProvider.get("prm.notification.createsubscription2.submitbutton.label")%></button> 
     344                <td align="center" colspan="3" class="notify-edit-bottom" height="40"><button type="button" style="width: 100px;" onClick="return finish();"> <%=PropertyProvider.get("prm.notification.createsubscription2.submitbutton.label")%></button> 
    337345                        </td> 
     346                        <td width="3%">&nbsp;</td> 
    338347            </tr> 
    339348</table> 
    340349 
    341 </form></div> 
     350</form> 
    342351<%@ include file="/help/include_outside/footer.jsp" %> 
    343352