Skip to content

Commit 4e48480

Browse files
skavanaghskavanagh
committed
Removed profile settings under user section.
Removed profile settings under user section. Users can now be added to a profile.
1 parent 04d2ad4 commit 4e48480

4 files changed

Lines changed: 0 additions & 257 deletions

File tree

‎src/main/java/com/keybox/manage/action/UserProfileAction.java‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎src/main/webapp/manage/view_profile_users.jsp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@
106106
<th><s:checkbox name="userSelectAll" cssClass="userSelect" theme="simple"/></th>
107107
<th id="<s:property value="@com.keybox.manage.db.UserDB@SORT_BY_USERNAME"/>" class="sort">Username
108108
</th>
109-
<th id="<s:property value="@com.keybox.manage.db.UserDB@SORT_BY_USER_TYPE"/>" class="sort">User Type
110-
</th>
111109
<s:if test="%{@com.keybox.manage.util.ExternalAuthUtil@externalAuthEnabled}">
112110
<th id="<s:property value="@com.keybox.manage.db.UserDB@SORT_BY_AUTH_TYPE"/>" class="sort">Auth Type
113111
</th>
@@ -138,14 +136,6 @@
138136
<s:property value="username"/>
139137
</s:else>
140138
</td>
141-
<td>
142-
<s:if test="userType==\"A\"">
143-
Administrative Only
144-
</s:if>
145-
<s:else>
146-
Full Access
147-
</s:else>
148-
</td>
149139
<s:if test="%{@com.keybox.manage.util.ExternalAuthUtil@externalAuthEnabled}">
150140
<td>
151141
<s:if test="authType==\"BASIC\"">

‎src/main/webapp/manage/view_user_profiles.jsp‎

Lines changed: 0 additions & 135 deletions
This file was deleted.

‎src/main/webapp/manage/view_users.jsp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,6 @@
168168
<button id="del_btn_<s:property value="id"/>" class="btn btn-default del_btn spacer spacer-middle">Delete</button>
169169
</s:if>
170170

171-
<s:if test="userType==\"A\"">
172-
<a href="viewUserProfiles.action?user.id=<s:property value="id"/>">
173-
<button id="profile_btn_<s:property value="id"/>" class="btn btn-default edit_btn spacer spacer-right">Assign Profiles</button>
174-
</a>
175-
</s:if>
176171
<div style="clear:both"></div>
177172
</div>
178173
</td>

0 commit comments

Comments
 (0)