Changeset 308 for ether_megapoli/trunk
- Timestamp:
- 12/15/11 16:04:05 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/domain/interface/com/ether/user/UserFilter.java
r287 r308 8 8 extends Filter 9 9 { 10 public UserFilter( @NotNull final String sort, final boolean sortAccessBoFalse, final boolean sortAccessBoTrue, @NotNull final Integer maxResults, @NotNull final Integer page )10 public UserFilter( @NotNull final String sort, @Nullable final String searchText, final boolean sortAccessBoFalse, final boolean sortAccessBoTrue, @NotNull final Integer maxResults, @NotNull final Integer page ) 11 11 { 12 12 _sort = sort; 13 _searchText = searchText; 13 14 _sortAccessBoFalse = sortAccessBoFalse; 14 15 _sortAccessBoTrue = sortAccessBoTrue; … … 50 51 } 51 52 53 @Nullable 54 public String getSearchText() 55 { 56 return _searchText; 57 } 58 59 public void setSearchText( @Nullable final String searchText ) 60 { 61 _searchText = searchText; 62 } 63 52 64 public boolean isSortAccessBoFalse() 53 65 { … … 76 88 @Nullable 77 89 private UserState _sortState; 90 @Nullable 91 private String _searchText; 78 92 private boolean _sortAccessBoFalse; 79 93 private boolean _sortAccessBoTrue; -
ether_megapoli/trunk/persistence/implementation/com/ether/dao/DomainAccessObjectImpl.java
r300 r308 323 323 public static Criterion escapedLike( final String fieldName, final String value ) 324 324 { 325 final String escapedValueWithWildcard = escapeForSqlSelect( value );326 return new LikeExpression( fieldName, escapedValueWithWildcard, MatchMode.ANYWHERE, '\\', true );325 // final String escapedValueWithWildcard = escapeForSqlSelect( value ); 326 return new LikeExpression( fieldName, value, MatchMode.ANYWHERE, null, true ); 327 327 } 328 328 -
ether_megapoli/trunk/persistence/implementation/com/ether/dao/user/UserDAOImpl.java
r287 r308 12 12 import org.jetbrains.annotations.NotNull; 13 13 import org.jetbrains.annotations.Nullable; 14 import org.springframework.util.StringUtils; 14 15 15 16 import java.util.List; … … 75 76 criteria.add( Restrictions.eq( "accessToBO", true ) ); 76 77 78 if( StringUtils.hasText( filter.getSearchText() ) ) 79 criteria.add( Restrictions.or( Restrictions.or( escapedLike( "lastName", filter.getSearchText() ), escapedLike( "firstName", filter.getSearchText() ) ), escapedLike( "email", filter.getSearchText() ) ) ); 80 77 81 if( !isForCount ) 78 82 criteria.addOrder( Order.asc( filter.getSort() ) ); -
ether_megapoli/trunk/web/backoffice/user-script.jsp
r289 r308 120 120 { 121 121 var parametersUrl = "sort=" + this.selectSorts.getValue() + "&sortRole=" + this.selectSortsRoles.getValue() + "&sortState=" + this.selectSortsStates.getValue() + 122 "&searchText=" + $( "#search_text" ).val() + 122 123 "&sortAccessBoTrue=" + $( "#sort_accessBO_true" ).attr( 'checked' ) + "&sortAccessBoFalse=" + $( "#sort_accessBO_false" ).attr( 'checked' ) + 123 124 "&maxResults=" + this.selectSortsDisplay.getValue() + "&page=" + this.containerPage.html(); -
ether_megapoli/trunk/web/backoffice/user.jsp
r306 r308 57 57 58 58 <%-- ****************** SORTS ****************** --%> 59 <div class="containerSorts"> 60 <div style="float:left"><bean:message key="bo.sort.asc"/> : </div> 61 <div id="containerSorts" style="float:left"></div> 62 </div> 63 64 <div class="containerSorts"> 65 <div style="float:left"><bean:message key="bo.user.role"/> : </div> 66 <div id="containerSorts_roles" style="float:left"></div> 67 </div> 68 69 <div class="containerSorts"> 70 <div style="float:left"><bean:message key="bo.user.state"/> : </div> 71 <div id="containerSorts_states" style="float:left"></div> 72 </div> 73 74 <div class="containerSorts"> 75 <div style="float:left"><bean:message key="bo.user.boAccess.help"/> : </div> 76 <div style="float:left"> 77 <input id="sort_accessBO_true" type="checkbox" checked="checked"><bean:message key="app.yes"/> 78 <input id="sort_accessBO_false" type="checkbox" checked="checked"><bean:message key="app.no"/> 79 </div> 80 </div> 81 82 <div class="containerSorts"> 83 <div style="float:left"><bean:message key="bo.viewBy"/> : </div> 84 <div id="containerSorts_display" style="float:left"></div> 85 </div> 86 87 <div style="float:right"> 88 <button id="sortButton" class="small positive"><bean:message key="bo.go"/></button> 59 <div class="containerSortsAndSearch"> 60 <div class="containerSorts"> 61 <div style="float:left"><bean:message key="bo.sort.asc"/> : </div> 62 <div id="containerSorts" style="float:left"></div> 63 </div> 64 65 <div class="containerSorts"> 66 <div style="float:left"><bean:message key="bo.user.role"/> : </div> 67 <div id="containerSorts_roles" style="float:left"></div> 68 </div> 69 70 <div class="containerSorts"> 71 <div style="float:left"><bean:message key="bo.user.state"/> : </div> 72 <div id="containerSorts_states" style="float:left"></div> 73 </div> 74 75 <div class="containerSorts"> 76 <div style="float:left"><bean:message key="bo.user.boAccess.help"/> : </div> 77 <div style="float:left"> 78 <input id="sort_accessBO_true" type="checkbox" checked="checked"><bean:message key="app.yes"/> 79 <input id="sort_accessBO_false" type="checkbox" checked="checked"><bean:message key="app.no"/> 80 </div> 81 </div> 82 83 <div class="containerSortsButton"> 84 <button id="sortButton" class="small positive"><bean:message key="bo.go"/></button> 85 </div> 86 87 <div class="containerSorts"> 88 <div style="float:left"><bean:message key="bo.viewBy"/> : </div> 89 <div id="containerSearch" style="float:left"><input type="text" id="search_text" size="29"></div> 90 </div> 91 92 <div class="containerSorts"> 93 <div style="float:left"><bean:message key="bo.viewBy"/> : </div> 94 <div id="containerSorts_display" style="float:left"></div> 95 </div> 96 89 97 </div> 90 98 <BR/><BR/> -
ether_megapoli/trunk/web/resources/css/backoffice.css
r287 r308 52 52 .containerSorts { 53 53 float: left; 54 margin-right: 21px; 54 margin-right: 55px; 55 } 56 57 .containerSortsButton { 58 float: right; 59 margin-right: 50px; 60 margin-top: 9px; 61 } 62 63 .containerSortsAndSearch { 64 margin-bottom: 19px; 55 65 } 56 66 -
ether_megapoli/trunk/web/src/com/ether/ControllerBackoffice.java
r287 r308 45 45 throws ServiceException, WebException 46 46 { 47 final JSONObject jsonObject = sortUser( "lastName", "ALL", "ALL", true, true, 5, 1 );47 final JSONObject jsonObject = sortUser( "lastName", null, "ALL", "ALL", true, true, 5, 1 ); 48 48 jsonObject.put( "jSonUserStates", getJSONUserStates() ); 49 49 jsonObject.put( "jSonUserRoles", getJSONUserRoles() ); … … 178 178 @ControllerMethod(jsonResult = true) 179 179 public JSONObject sortUser( @NotNull @ParamName("sort") final String sort, 180 @Nullable @ParamName("searchText") final String searchText, 180 181 @NotNull @ParamName("sortRole") final String sortRole, 181 182 @NotNull @ParamName("sortState") final String sortState, … … 186 187 throws WebException, ServiceException 187 188 { 188 final UserFilter filter = new UserFilter( sort, s ortAccessBoFalse, sortAccessBoTrue, maxResults, page );189 final UserFilter filter = new UserFilter( sort, searchText, sortAccessBoFalse, sortAccessBoTrue, maxResults, page ); 189 190 if( !"ALL".equals( sortRole ) ) 190 191 filter.setSortRole( UserRole.valueOf( sortRole ) );
Note: See TracChangeset
for help on using the changeset viewer.