Revision 65:8ac02c83995b

View differences:

WebContent/jsp/ss223_application/ibssAppUserResetPassResult.jsp
21 21
  </tr>
22 22
  <tr>
23 23
    <td height="28">&nbsp;</td>
24
    <td colspan="2"><bean:message key="appuser.user.id" />:<c:out value="${detailBean.map.userAlias}"></c:out>&nbsp;<bean:message key="user.password.reset.successful"/> </td>
24
    <td colspan="2"><Strong></Strong><bean:message key="app.user.successful.msg" /><c:out value="${detailBean.map.userAlias}"></c:out>&nbsp;<bean:message key="user.password.reset.successful"/></Strong> </td>
25 25
    <td>&nbsp;</td>
26 26
  </tr>
27 27
  <tr>
src/com/ib/ibss/enterprise/services/ss103_group/IBSSUserGroupEditResultServices.java
13 13

  
14 14
import java.util.ArrayList;
15 15
import java.util.Date;
16
import java.util.Iterator;
17
import java.util.LinkedList;
16 18
import java.util.List;
17 19
import net.penril.ibss.audit.log.AuditLogConstants;
18 20
import net.penril.ibss.audit.log.USER_ACTIVITY_TYTPE;
19 21
import net.penril.ibss.core.hibernate.AdminGroup;
22
import net.penril.ibss.core.hibernate.AdminNavigation;
20 23
import net.penril.ibss.core.hibernate.AdminNavigationGroup;
21 24

  
22 25
import org.hibernate.exception.ConstraintViolationException;
23 26

  
27
import com.ib.ibss.common.constant.AdminNavigationModeType.ModeType;
24 28
import com.ib.ibss.common.utils.ResourcesUtils;
25 29
import com.ib.ibss.enterprise.services.IBSSEnterpriseServicesWorkspace;
26 30
import com.ib.ibss.enterprise.services.common.BeanToBeanTransferUtils;
......
119 123
	{
120 124
		c_oGroup = getAdminGroupDAO ().getGroupByIdentifier (p_oGroupId);		
121 125
		List<Long> deleteActionNodeIds = new ArrayList<Long> ();
126
		List<AdminNavigation> reuseNavs = new LinkedList<AdminNavigation> ();
122 127

  
123 128
		if(c_oGroup != null)
124 129
		{
......
135 140
			//clear the admin navigation group before reassign				
136 141
			c_oGroup.getGroupNavigations ().clear ();
137 142
			
138
			Long [] c_saNavigations = getAdminNavigationGroupDAO().getNodesByGroupId(p_oGroupId);
143
			String modeStr = ModeType.SYSTEM_ADMIN.getModeIdentifier (); //Set default value to SYSTEM_ADMIN
144
			ModeType modeType = ModeType.getByValue(modeStr); 
145
			List<AdminNavigation> navigations = getAdminNavigationDAO ().getNavigationByNodeSystem(modeType.getAccessName());
146
			
147
			boolean isFirst = true;
148
			AdminNavigation each;
149
			for(Iterator<AdminNavigation> it = navigations.iterator (); it.hasNext ();)
150
			{
151
				each = it.next ();
152
				
153
				if(each.getParentId () == null)
154
				{
155
					if(isFirst)
156
					{
157
						reuseNavs.addAll (navigations);
158
						isFirst = false;
159
					}
160
					
161
					reuseNavs.remove (each);
162
//					doIterate (reuseNavs, each, reuseNavs.size ());
163
//					sortedNavs.add (each);
164
				}
165
			}
166
			
167
			navigations = reuseNavs;
168
			
169
			List<Long> naviList= new ArrayList<Long>(); 
170
			
171
			for(AdminNavigation navi : navigations)
172
			{
173
				Long id = navi.getNodeId();
174
				naviList.add(id);
175
			}
176
			
177
			Long [] c_saNavigations = new Long[naviList.size()];;
178
			naviList.toArray(c_saNavigations);
139 179
			
140 180
			//clear the admin navigation group before reassign				
141 181
			c_oGroup.getGroupNavigations ().clear ();
......
185 225
					{
186 226
						m_oNavigationGroup.setIsView (new Long(1));
187 227
					}
228
					
229
					if(m_oNavigationGroup.isEditable()||m_oNavigationGroup.isViewable())
230
					{
231
						c_oGroup.getGroupNavigations ().add (m_oNavigationGroup);
232
					}
188 233

  
189
					c_oGroup.getGroupNavigations ().add (m_oNavigationGroup);					
190 234
				}
235
				
191 236
			}
192

  
237
			
193 238
		}
194 239
		else
195 240
		{
src/com/ib/ibss/enterprise/services/ss223_application/IBSSApplicationUserDeleteResultServices.java
95 95
			}
96 96
			
97 97
			getIBSSDynaBean ().set (IBSSUserConstants.JSP_TITLE, 
98
					ResourcesUtils.getApplicationResourceMessage ("group.name.successful.msg", new String[]{userAlias}) + " " +
98
					ResourcesUtils.getApplicationResourceMessage ("app.user.successful.msg", new String[]{userAlias}) + " " +
99 99
							ResourcesUtils.getApplicationResourceMessage ("general.status.lower.deleted"));
100 100
			
101 101
			

Also available in: Unified diff