Merge branch 'master_tolag3'
This commit is contained in:
commit
beb276acac
@ -53,7 +53,6 @@
|
|||||||
|
|
||||||
<egov-security:secured-object-config id="securedObjectConfig"
|
<egov-security:secured-object-config id="securedObjectConfig"
|
||||||
roleHierarchyString="
|
roleHierarchyString="
|
||||||
ROLE_ADMIN > ROLE_ADR_ADMIN
|
|
||||||
ROLE_ADMIN > ROLE_VISIT
|
ROLE_ADMIN > ROLE_VISIT
|
||||||
ROLE_ADMIN > ROLE_ADR_JRSDC
|
ROLE_ADMIN > ROLE_ADR_JRSDC
|
||||||
ROLE_ADMIN > ROLE_ADR_KIPO
|
ROLE_ADMIN > ROLE_ADR_KIPO
|
||||||
@ -61,7 +60,6 @@
|
|||||||
ROLE_ADR_JRSDC > ROLE_USER_MANAGER
|
ROLE_ADR_JRSDC > ROLE_USER_MANAGER
|
||||||
ROLE_ADR_KIPO > ROLE_USER_MANAGER
|
ROLE_ADR_KIPO > ROLE_USER_MANAGER
|
||||||
ROLE_ADR_PREV > ROLE_USER_MANAGER
|
ROLE_ADR_PREV > ROLE_USER_MANAGER
|
||||||
ROLE_ADR_ADMIN > ROLE_USER_MANAGER
|
|
||||||
ROLE_VISIT > ROLE_USER_MANAGER
|
ROLE_VISIT > ROLE_USER_MANAGER
|
||||||
ROLE_USER_MANAGER > ROLE_USER_MEMBER
|
ROLE_USER_MANAGER > ROLE_USER_MEMBER
|
||||||
ROLE_USER_MEMBER > ROLE_ANONYMOUS"
|
ROLE_USER_MEMBER > ROLE_ANONYMOUS"
|
||||||
|
|||||||
@ -132,7 +132,7 @@
|
|||||||
'' AS menuCours
|
'' AS menuCours
|
||||||
/*getMenuCours(MENU_NO) AS menuCours*/
|
/*getMenuCours(MENU_NO) AS menuCours*/
|
||||||
FROM LETTNMENUINFO
|
FROM LETTNMENUINFO
|
||||||
WHERE CAST(UPPER_MENU_NO AS VARCHAR) = #menuNo#;
|
WHERE UPPER_MENU_NO = #menuNo#;
|
||||||
]]>
|
]]>
|
||||||
</select>
|
</select>
|
||||||
</sqlMap>
|
</sqlMap>
|
||||||
@ -16,11 +16,11 @@
|
|||||||
</Appenders>
|
</Appenders>
|
||||||
|
|
||||||
<Loggers>
|
<Loggers>
|
||||||
<Logger name="org.apache" level="DEBUG"></Logger>
|
<Logger name="org.apache" level="ERROR"></Logger>
|
||||||
<Logger name="org.springframework" level="DEBUG"></Logger>
|
<Logger name="org.springframework" level="ERROR"></Logger>
|
||||||
|
|
||||||
<Logger name="egovframework" level="DEBUG"></Logger>
|
<Logger name="egovframework" level="ERROR"></Logger>
|
||||||
<Logger name="egovframework.rte" level="DEBUG"></Logger>
|
<Logger name="egovframework.rte" level="ERROR"></Logger>
|
||||||
|
|
||||||
<Logger name="com.ibatis.sqlmap" level="DEBUG"></Logger>
|
<Logger name="com.ibatis.sqlmap" level="DEBUG"></Logger>
|
||||||
|
|
||||||
|
|||||||
@ -386,7 +386,7 @@ function wrapWindowByMask(){
|
|||||||
<td colspan="3">
|
<td colspan="3">
|
||||||
<select name="authorCode" class="sel_type1" title="권한" onchange="authorChange(this)">
|
<select name="authorCode" class="sel_type1" title="권한" onchange="authorChange(this)">
|
||||||
<c:forEach var="authorResult" items="${authorList}" varStatus="status">
|
<c:forEach var="authorResult" items="${authorList}" varStatus="status">
|
||||||
<option value="<c:out value="${authorResult.authorCode}"/>" <c:if test="${authorResult.authorCode eq 'ROLE_ADR_ADMIN' }">selected</c:if>>
|
<option value="<c:out value="${authorResult.authorCode}"/>" <c:if test="${authorResult.authorCode eq 'ROLE_VISIT' }">selected</c:if>>
|
||||||
<c:out value="${authorResult.authorNm}"/>
|
<c:out value="${authorResult.authorNm}"/>
|
||||||
</option>
|
</option>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
|
|||||||
@ -62,7 +62,7 @@ $( document ).ready(function(){
|
|||||||
} */
|
} */
|
||||||
|
|
||||||
//직급 셀렉트박스 설정
|
//직급 셀렉트박스 설정
|
||||||
if("${userManageVO.authorCode}" == "ROLE_ADR_ADMIN"){
|
if("${userManageVO.authorCode}" == "ROLE_VISIT"){
|
||||||
$("#rank1").css('display', 'block');
|
$("#rank1").css('display', 'block');
|
||||||
$("#rank2").css('display', 'none');
|
$("#rank2").css('display', 'none');
|
||||||
$("#rank1").attr('disabled', false);
|
$("#rank1").attr('disabled', false);
|
||||||
|
|||||||
@ -62,7 +62,7 @@ $( document ).ready(function(){
|
|||||||
} */
|
} */
|
||||||
|
|
||||||
//직급 셀렉트박스 설정
|
//직급 셀렉트박스 설정
|
||||||
if("${userManageVO.authorCode}" == "ROLE_ADR_ADMIN"){
|
if("${userManageVO.authorCode}" == "ROLE_VISIT"){
|
||||||
$("#rank1").css('display', 'block');
|
$("#rank1").css('display', 'block');
|
||||||
$("#rank2").css('display', 'none');
|
$("#rank2").css('display', 'none');
|
||||||
$("#rank1").attr('disabled', false);
|
$("#rank1").attr('disabled', false);
|
||||||
|
|||||||
@ -896,7 +896,7 @@ function set_bbs(){
|
|||||||
<span id="BBSNameSpan" style="color: blue"></span>
|
<span id="BBSNameSpan" style="color: blue"></span>
|
||||||
<span id="showUrl" style="display: none;" >
|
<span id="showUrl" style="display: none;" >
|
||||||
<br>
|
<br>
|
||||||
URL <input type="text" name="url" id="url" size="90"/>
|
URL <input type="text" name="url" id="url" size="50"/>
|
||||||
<input type="hidden" id="url_tmp" name="url_tmp"/>
|
<input type="hidden" id="url_tmp" name="url_tmp"/>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user