Revision 44:432095fe3ea3

View differences:

WebContent/WEB-INF/config/ss100_navigation/validation.xml
8 8
			<field depends="required, alphaNumericSpace" property="nodeName">
9 9
				<arg0 key="navigation.node.name" />
10 10
			</field>
11
			<field depends="required" property="nodeStatus">
11
			<!-- <field depends="required" property="nodeStatus">
12 12
				<arg0 key="navigation.status" />
13
			</field>
13
			</field> -->
14 14
		</form>
15 15
		<form name="adminEnquirySearchValidation">
16 16
			<field depends="alphaNumericSpace" property="nodeName">
WebContent/jsp/ss100_navigation/ibssNavigationEdit.jsp
49 49
    <td colspan="2"><strong><htmlEL:textarea name="ibssNavigationForm" property="nodeDescription" /></strong></td>
50 50
    <td colspan="2">&nbsp;</td>
51 51
  </tr>
52
   <c:if test="${ibssNavigationForm.map.nodeID ne 19 }">
52
  <%--  <c:if test="${ibssNavigationForm.map.nodeID ne 19 }">
53 53
  <c:if test="${ibssNavigationForm.map.nodeCode ne 'ANAV' }">
54 54
  <tr>
55 55
    <td>&nbsp;</td>
......
66 66
    <td colspan="2">&nbsp;</td>
67 67
  </tr>
68 68
  </c:if>
69
  </c:if>
69
  </c:if> --%>
70 70
  <tr>
71 71
    <td>&nbsp;</td>
72 72
    <td>&nbsp;</td>
src/com/ib/ibss/controller/actions/ss100_navigation/IBSSNavigationMainAction.java
53 53
	 * Create new instance of IBSSNavigationMainServices and call execute() method.
54 54
	 * </pre>
55 55
	 *
56
	 * @param p_oMapping The ActionMapping used to select this instance
57
	 * @param p_oForm The optional ActionForm bean for this request which is from form-bean.xml(if any)
58
	 * @param p_oRequest The HTTP request we are processing
59
	 * @param p_oResponse The HTTP response we are creating
56
	 * @param mapping The ActionMapping used to select this instance
57
	 * @param form The optional ActionForm bean for this request which is from form-bean.xml(if any)
58
	 * @param request The HTTP request we are processing
59
	 * @param response The HTTP response we are creating
60 60
	 * @return The requested ActionForward object
61 61
	 * @throws Exception if the application business logic throws an exception
62 62
	 *
63 63
	 * @see com.ib.ibss.struts.utils.IBSSControllerAction#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
64 64
	 */
65
	public ActionForward execute (ActionMapping p_oMapping, ActionForm p_oForm, HttpServletRequest p_oRequest, HttpServletResponse p_oResponse) throws Exception
65
	public ActionForward execute (ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception
66 66
	{
67
		ActionForm m_oForm = (ActionForm) resetBean (p_oRequest, p_oMapping, p_oForm);
67
		ActionForm actionForm = (ActionForm) resetBean (request, mapping, form);
68 68
		
69 69
		try
70 70
		{
71
			checkToken (p_oRequest, p_oMapping, false);
72
			checkCredential (p_oRequest, FunctionCodeEnum.ADMIN_NAVIGATION, ErrorPageEnum.CONTENT_MANAGEMENT_TEMPLATE);
71
			checkToken (request, mapping, false);
72
			checkCredential (request, FunctionCodeEnum.ADMIN_NAVIGATION, ErrorPageEnum.CONTENT_MANAGEMENT_TEMPLATE);
73 73
			
74
			noErrorHandling (p_oRequest, p_oMapping);
75
			IBSSDynaBean m_oIBDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (m_oForm, p_oMapping);
76
			IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
74
			noErrorHandling (request, mapping);
75
			IBSSDynaBean ibDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (actionForm, mapping);
76
			IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(request);
77 77
			
78
			IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
79
			m_oTree.buildNavigation ();
78
			IBSSNavigationUtil tree = new IBSSNavigationUtil(m_oSessionObjects);
79
			tree.buildNavigation ();
80 80
			
81
			IBSSNavigationMainServices m_oServices = new IBSSNavigationMainServices(m_oSessionObjects);
81
			IBSSNavigationMainServices services = new IBSSNavigationMainServices(m_oSessionObjects);
82 82
			/* reset navigating node ID */
83
			m_oIBDynaBean.set (IBSSNavigationConstants.SELECT_NODE_ID, null);
84
			m_oServices.setIBSSDynaBean (m_oIBDynaBean);
85
			m_oServices.execute();
83
			ibDynaBean.set (IBSSNavigationConstants.SELECT_NODE_ID, null);
84
			services.setIBSSDynaBean (ibDynaBean);
85
			services.execute();
86 86
		}
87 87
		catch (IBSSGenericException e)
88 88
		{
89
			errorHandling(p_oRequest, p_oMapping, e);
89
			errorHandling(request, mapping, e);
90 90
		}
91
		return super.execute (p_oMapping, m_oForm, p_oRequest, p_oResponse);
91
		return super.execute (mapping, actionForm, request, response);
92 92
	}
93 93
}
src/com/ib/ibss/controller/actions/ss100_navigation/IBSSSubNavigationAction.java
54 54
	 * Create new instance of IBSSRetailNavigationMainServices and call execute() method.
55 55
	 * </pre>
56 56
	 *
57
	 * @param p_oMapping The ActionMapping used to select this instance
58
	 * @param p_oForm The optional ActionForm bean for this request which is from form-bean.xml(if any)
59
	 * @param p_oRequest The HTTP request we are processing
60
	 * @param p_oResponse The HTTP response we are creating
57
	 * @param mapping The ActionMapping used to select this instance
58
	 * @param form The optional ActionForm bean for this request which is from form-bean.xml(if any)
59
	 * @param request The HTTP request we are processing
60
	 * @param response The HTTP response we are creating
61 61
	 * @return The requested ActionForward object
62 62
	 * @throws Exception if the application business logic throws an exception
63 63
	 *
64 64
	 * @see com.ib.ibss.struts.utils.IBSSControllerAction#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
65 65
	 */
66
	public ActionForward execute (ActionMapping p_oMapping, ActionForm p_oForm, HttpServletRequest p_oRequest, HttpServletResponse p_oResponse) throws Exception
66
	public ActionForward execute (ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception
67 67
	{
68 68
		try
69 69
		{
70
			checkToken (p_oRequest, p_oMapping, false);
71
			checkCredential (p_oRequest, FunctionCodeEnum.ADMIN_NAVIGATION, ErrorPageEnum.CONTENT_MANAGEMENT_TEMPLATE);
70
			checkToken (request, mapping, false);
71
			checkCredential (request, FunctionCodeEnum.ADMIN_NAVIGATION, ErrorPageEnum.CONTENT_MANAGEMENT_TEMPLATE);
72 72
			
73
			noErrorHandling (p_oRequest, p_oMapping);
73
			noErrorHandling (request, mapping);
74 74
			
75
			String m_sCrumbID = p_oRequest.getParameter ("secondCrumbID");
76
			String m_sNodeID = p_oRequest.getParameter (IBSSNavigationConstants.NODE_ID);
77
			IBSSDynaBean m_oIBDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (p_oForm, p_oMapping);
78
			IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(p_oRequest);
79
			if(DataValidator.isEmptyString (m_sNodeID))
75
			String crumbID = request.getParameter ("secondCrumbID");
76
			String nodeID = request.getParameter (IBSSNavigationConstants.NODE_ID);
77
			IBSSDynaBean ibDynaBean = IBSSDynaBeanManager.createIBSSDynaBean (form, mapping);
78
			IBSSSessionObjects m_oSessionObjects = new IBSSSessionObjects(request);
79
			if(DataValidator.isEmptyString (nodeID))
80 80
			{
81
				m_oIBDynaBean.set (IBSSNavigationConstants.SELECT_NODE_ID, m_sCrumbID);
81
				ibDynaBean.set (IBSSNavigationConstants.SELECT_NODE_ID, crumbID);
82 82
			}
83 83
			else
84 84
			{
85
				m_oIBDynaBean.set (IBSSNavigationConstants.SELECT_NODE_ID, m_sNodeID);
85
				ibDynaBean.set (IBSSNavigationConstants.SELECT_NODE_ID, nodeID);
86 86
			}
87
			IBSSNavigationUtil m_oTree = new IBSSNavigationUtil(m_oSessionObjects);
88
			m_oTree.buildNavigation ();
87
			IBSSNavigationUtil tree = new IBSSNavigationUtil(m_oSessionObjects);
88
			tree.buildNavigation ();
89 89
			
90
			IBSSSubNavigationServices m_oServices = new IBSSSubNavigationServices(m_oSessionObjects);
91
			m_oServices.setIBSSDynaBean (m_oIBDynaBean);
92
			m_oServices.execute();
90
			IBSSSubNavigationServices services = new IBSSSubNavigationServices(m_oSessionObjects);
91
			services.setIBSSDynaBean (ibDynaBean);
92
			services.execute();
93 93
		}
94 94
		catch (IBSSGenericException e)
95 95
		{
96
			errorHandling(p_oRequest, p_oMapping, e);
96
			errorHandling(request, mapping, e);
97 97
		}
98
		return super.execute (p_oMapping, p_oForm, p_oRequest, p_oResponse);
98
		return super.execute (mapping, form, request, response);
99 99
	}
100 100
}
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSNavigationEditResultServices.java
73 73
	StringBuffer c_sLogDescription	= new StringBuffer();
74 74
	String c_sLogReason 			= "";
75 75
	String c_sNodeDescription;
76
	boolean c_bNodeStatus;
76
//	boolean c_bNodeStatus;
77 77
	String c_sNodeName;
78 78
	String c_sNodeNameOri;
79 79
	String c_sNodeCode;
......
157 157
			c_oNavigation.setNodeDescription (c_sNodeDescription);
158 158
			c_oNavigation.setNodeName (c_sNodeName);
159 159
			c_oNavigation.setNodeUpdatedDate (new Date());
160
			c_oNavigation.setNodeStatus (c_bNodeStatus ? "0" : "1");
160
//			c_oNavigation.setNodeStatus (c_bNodeStatus ? "0" : "1");
161 161
			c_oNavigation.setNodeUpdatedBy (getIBSSessionObjects ().getSessionUser ().getUserId ());
162 162
			
163 163
			/* This service to be shared among admin features and MK features */
......
194 194
		c_oDetailBean 		= (IBSSDynaBean) getIBSSDynaBean ().get (IBSSNavigationConstants.NAVIGATION_DETAIL_BEAN);
195 195
		c_oID				= Long.valueOf (getBeanMessage(IBSSNavigationConstants.NODE_ID));
196 196
		c_sNodeDescription 	= getBeanMessage (IBSSNavigationConstants.NODE_DESCRIPTION_FL);
197
		c_bNodeStatus		= (Boolean) getIBSSDynaBean ().get (IBSSNavigationConstants.NODE_STATUS);
197
//		c_bNodeStatus		= (Boolean) getIBSSDynaBean ().get (IBSSNavigationConstants.NODE_STATUS);
198 198
		c_sNodeName			= getBeanMessage (IBSSNavigationConstants.NODE_NAME_FL);
199 199
		c_sNodeNameOri		= getBeanMessage (IBSSNavigationConstants.NODE_NAME_ORI);
200 200
		c_sNodeCode			= getBeanMessage (IBSSNavigationConstants.NODE_CODE);
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSNavigationEditServices.java
65 65
				setBeanMessage (IBSSNavigationConstants.NODE_NAME_FL, m_oNavigation.getNodeName ());
66 66
				setBeanMessage (IBSSNavigationConstants.NODE_NAME_ORI, m_oNavigation.getNodeName ());
67 67
				setBeanMessage (IBSSNavigationConstants.NODE_DESCRIPTION_FL, m_oNavigation.getNodeDescription ());
68
				getIBSSDynaBean ().set (IBSSNavigationConstants.NODE_STATUS, "0".equals (m_oNavigation.getNodeStatus ()) ? true : false);
68
//				getIBSSDynaBean ().set (IBSSNavigationConstants.NODE_STATUS, "0".equals (m_oNavigation.getNodeStatus ()) ? true : false);
69 69
				setBeanMessage (IBSSNavigationConstants.NODE_CODE, m_oNavigation.getNodeCode ());
70 70
				setBeanMessage (IBSSNavigationConstants.NODE_ID, String.valueOf (m_oNavigation.getNodeId ()));
71 71
			}
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSNavigationMainServices.java
64 64
	{
65 65
		IBSSLogger.debug (c_oClass, "Entering execute");
66 66
		
67
		IBSSDynaBean m_oViewBean = null;
68
		IBSSDynaBean m_oBean = null;
69
		List<AdminNavigation> m_oNavigations = null;
70
		List<IBSSDynaBean> m_oNodeDisplay = new LinkedList<IBSSDynaBean> ();
71
		List<IBSSDynaBean> m_oBranchDisplay = new LinkedList<IBSSDynaBean> ();
67
		IBSSDynaBean viewBean = null;
68
		IBSSDynaBean bean = null;
69
		List<AdminNavigation> navigationsList = null;
70
		List<IBSSDynaBean> nodeDisplay = new LinkedList<IBSSDynaBean> ();
71
		List<IBSSDynaBean> branchDisplay = new LinkedList<IBSSDynaBean> ();
72 72
		
73
		AdminNavigation m_oNavigation;
73
		AdminNavigation navigation;
74 74
		
75 75
		try
76 76
		{
77
			m_oNavigations = getAdminNavigationDAO ().getNavigationByCategory (new Long(1));
78
			m_oViewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_VIEW, getIBSSDynaBean().getActionMapping());
77
			navigationsList = getAdminNavigationDAO ().getNavigationByCategory (new Long(1));
78
			viewBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_VIEW, getIBSSDynaBean().getActionMapping());
79 79
			
80
			for(Iterator<AdminNavigation> it = m_oNavigations.iterator ();it.hasNext ();)
80
			for(Iterator<AdminNavigation> it = navigationsList.iterator ();it.hasNext ();)
81 81
			{
82
				m_oNavigation = it.next ();
82
				navigation = it.next ();
83 83
				
84
				m_oBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
85
				m_oBean.set (IBSSNavigationConstants.NODE_ID, m_oNavigation.getNodeId ());
86
				m_oBean.set (IBSSNavigationConstants.NODE_CODE, m_oNavigation.getNodeCode ());
87
				m_oBean.set (IBSSNavigationConstants.NODE_NAME_FL, m_oNavigation.getNodeName ());
88
				m_oBean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, "0".equals (m_oNavigation.getNodeStatus ()) ? "Online" : "Offline");
89
				m_oBean.set (IBSSNavigationConstants.PARENT_ID, m_oNavigation.getParentId ());
84
				bean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
85
				bean.set (IBSSNavigationConstants.NODE_ID, navigation.getNodeId ());
86
				bean.set (IBSSNavigationConstants.NODE_CODE, navigation.getNodeCode ());
87
				bean.set (IBSSNavigationConstants.NODE_NAME_FL, navigation.getNodeName ());
88
				bean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, "0".equals (navigation.getNodeStatus ()) ? "Online" : "Offline");
89
				bean.set (IBSSNavigationConstants.PARENT_ID, navigation.getParentId ());
90 90
				
91
				if("0".equals (m_oNavigation.getNodeType ()))
91
				if("0".equals (navigation.getNodeType ()))
92 92
				{
93
					m_oBranchDisplay.add (m_oBean);
93
					branchDisplay.add (bean);
94 94
				}
95 95
				else
96 96
				{
97
					m_oNodeDisplay.add (m_oBean);
97
					nodeDisplay.add (bean);
98 98
				}
99 99
			}
100 100
			
......
106 106
					Long actionId = IBAMPermission.EDIT_IBAM_NAVIGATION.getActionId();
107 107
					SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(getIBSSessionObjects());
108 108
					isAccessible = access.checkUserAccess(actionId);
109
					m_oViewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
109
					viewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
110 110
				} else {
111
					m_oViewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
111
					viewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
112 112
				}
113 113
			}
114 114
			
115
			m_oViewBean.set (IBSSNavigationConstants.NAVIGATIONS, m_oNavigations);
116
			m_oViewBean.set (IBSSNavigationConstants.NAVIGATION_NODE_SUMMARY, m_oNodeDisplay);
117
			m_oViewBean.set (IBSSNavigationConstants.NAVIGATION_BRANCH_SUMMARY, m_oBranchDisplay);
118
			getIBSSDynaBean ().set (IBSSNavigationConstants.NAVIGATION_VIEW, m_oViewBean);
115
			viewBean.set (IBSSNavigationConstants.NAVIGATIONS, navigationsList);
116
			viewBean.set (IBSSNavigationConstants.NAVIGATION_NODE_SUMMARY, nodeDisplay);
117
			viewBean.set (IBSSNavigationConstants.NAVIGATION_BRANCH_SUMMARY, branchDisplay);
118
			getIBSSDynaBean ().set (IBSSNavigationConstants.NAVIGATION_VIEW, viewBean);
119 119
			getIBSSDynaBean().set(IBSSNavigationConstants.IS_SEARCH, false);
120 120
			
121 121
			IBSSNavigationUtil.constructRootNavigationBreadCrumb (getIBSSessionObjects(), "/ss100/navigationEnquiryMain.do");
src/com/ib/ibss/enterprise/services/ss100_navigation/IBSSSubNavigationServices.java
64 64
		super(sessionObjects);
65 65
	}
66 66

  
67
	SimpleDateFormat c_oSDF = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
67
	SimpleDateFormat sdf = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
68 68
	
69 69
	public void execute () throws IBSSGenericException
70 70
	{
71 71
		IBSSLogger.debug (c_oClass, "Entering execute");
72 72
		
73
		IBSSDynaBean m_oViewBean = null;
74
		IBSSDynaBean m_oBean = null;
75
		List<IBSSDynaBean> m_oNodeDisplay = new LinkedList<IBSSDynaBean> ();
76
		List<IBSSDynaBean> m_oBranchDisplay = new LinkedList<IBSSDynaBean> ();
77
		AdminNavigation m_oNavigation = null;
73
		IBSSDynaBean viewBean = null;
74
		IBSSDynaBean bean = null;
75
		List<IBSSDynaBean> nodeDisplay = new LinkedList<IBSSDynaBean> ();
76
		List<IBSSDynaBean> branchDisplay = new LinkedList<IBSSDynaBean> ();
77
		AdminNavigation navigation = null;
78 78
		AdminNavigation each;
79 79
		
80 80
		try
81 81
		{
82
			m_oViewBean = (IBSSDynaBean) getIBSSDynaBean ().get(IBSSNavigationConstants.NAVIGATION_VIEW);
82
			viewBean = (IBSSDynaBean) getIBSSDynaBean ().get(IBSSNavigationConstants.NAVIGATION_VIEW);
83 83
			
84
			m_oNavigation = getAdminNavigationDAO ().getNavigationByID (Long.valueOf (getBeanMessage ("selectNodeID")));
84
			navigation = getAdminNavigationDAO ().getNavigationByID (Long.valueOf (getBeanMessage ("selectNodeID")));
85 85
			
86
			if(m_oNavigation != null)
86
			if(navigation != null)
87 87
			{
88
				for(Iterator<AdminNavigation> it = m_oNavigation.getSubNavigations ().iterator ();it.hasNext ();)
88
				for(Iterator<AdminNavigation> it = navigation.getSubNavigations ().iterator ();it.hasNext ();)
89 89
				{
90 90
					each = it.next ();
91
					m_oBean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
92
					m_oBean.set (IBSSNavigationConstants.NODE_ID, each.getNodeId ());
93
					m_oBean.set (IBSSNavigationConstants.NODE_CODE, each.getNodeCode ());
94
					m_oBean.set (IBSSNavigationConstants.NODE_NAME_FL, each.getNodeName ());
95
					m_oBean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, ("0".equals (each.getNodeStatus ()) ? "Navigable" : "Not Navigable"));
96
					m_oBean.set (IBSSNavigationConstants.PARENT_ID, each.getParentId ());
97
					m_oBean.set (IBSSNavigationConstants.NODE_UPDATED_DATE, each.getNodeUpdatedDate () != null ? c_oSDF.format (each.getNodeUpdatedDate ()) : "");
91
					bean = IBSSDynaBeanManager.createIBSSDynaBean(IBSSNavigationConstants.NAVIGATION_BEAN, getIBSSDynaBean().getActionMapping());
92
					bean.set (IBSSNavigationConstants.NODE_ID, each.getNodeId ());
93
					bean.set (IBSSNavigationConstants.NODE_CODE, each.getNodeCode ());
94
					bean.set (IBSSNavigationConstants.NODE_NAME_FL, each.getNodeName ());
95
					bean.set (IBSSNavigationConstants.NODE_STATUS_DISPLAY, ("0".equals (each.getNodeStatus ()) ? "Navigable" : "Not Navigable"));
96
					bean.set (IBSSNavigationConstants.PARENT_ID, each.getParentId ());
97
					bean.set (IBSSNavigationConstants.NODE_UPDATED_DATE, each.getNodeUpdatedDate () != null ? sdf.format (each.getNodeUpdatedDate ()) : "");
98 98
					
99 99
					if("0".equals (each.getNodeType ()))
100 100
					{
101
						m_oBranchDisplay.add (m_oBean);
101
						branchDisplay.add (bean);
102 102
					}
103 103
					else
104 104
					{
105
						m_oNodeDisplay.add (m_oBean);
105
						nodeDisplay.add (bean);
106 106
					}
107 107
				}
108 108
				
......
117 117
							Long actionId = IBAMPermission.EDIT_IBAM_NAVIGATION.getActionId();
118 118
							SessionUserPermissionVerificationService access = new SessionUserPermissionVerificationService(getIBSSessionObjects());
119 119
							isAccessible = access.checkUserAccess(actionId);
120
							m_oViewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
120
							viewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
121 121
						} else {
122
							m_oViewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
122
							viewBean.set (IBSSNavigationConstants.HAS_EDIT_ACCESS, isAccessible);
123 123
						}
124 124
					}
125 125
				}
126 126
				
127
				IBSSNavigationUtil.constructSecondSegmentAdminNavigationBreadCrumb (getAdminNavigationDAO (), m_oNavigation, getIBSSessionObjects(), "/ss100/subNavigationEnquiry.do","/ss100/searchNavigation.do", true);
127
				IBSSNavigationUtil.constructSecondSegmentAdminNavigationBreadCrumb (getAdminNavigationDAO (), navigation, getIBSSessionObjects(), "/ss100/subNavigationEnquiry.do","/ss100/searchNavigation.do", true);
128 128
				
129
				m_oViewBean.set (IBSSNavigationConstants.NAVIGATION_NODE_SUMMARY, m_oNodeDisplay);
130
				m_oViewBean.set (IBSSNavigationConstants.NAVIGATION_BRANCH_SUMMARY, m_oBranchDisplay);
131
				getIBSSDynaBean ().set (IBSSNavigationConstants.NAVIGATION_VIEW, m_oViewBean);
129
				viewBean.set (IBSSNavigationConstants.NAVIGATION_NODE_SUMMARY, nodeDisplay);
130
				viewBean.set (IBSSNavigationConstants.NAVIGATION_BRANCH_SUMMARY, branchDisplay);
131
				getIBSSDynaBean ().set (IBSSNavigationConstants.NAVIGATION_VIEW, viewBean);
132 132
			}
133 133
			else
134 134
			{

Also available in: Unified diff