Skip to content

Filtrování procesů dle loginů #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2014
Merged

Filtrování procesů dle loginů #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions search/src/java/cz/incad/Kramerius/views/ProcessesViewObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,18 @@ public String getFinishedBefore() {
return "";
}

public String getLoginNameLike() {
if (this.filter != null) {
List<Tripple> tripples = this.filter.getTripples();
for (Tripple tripple : tripples) {
if (tripple.getName().equals("loginname") && tripple.getOp().equals(SQLFilter.Op.LIKE)) {
return this.filter.getFormattedValue(tripple);
}
}
}
return "";
}

public String getNameLike() {
if (this.filter != null) {
List<Tripple> tripples = this.filter.getTripples();
Expand Down
1 change: 1 addition & 0 deletions search/src/java/labels.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ administrator.processes.filter.state=State
administrator.processes.filter.batch=Batch state

administrator.processes.filter.pname=Name contains
administrator.processes.filter.loginname=Login name contains
administrator.processes.filter.plannedafter=Planned after

administrator.processes.filter.plannedbefore=Planned before
Expand Down
1 change: 1 addition & 0 deletions search/src/java/labels_cs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ administrator.processes.filter.label=Pou\u017Eit\u00FD filtr
administrator.processes.filter.state=Stav
administrator.processes.filter.batch=D\u00E1vkov\u00FD stav
administrator.processes.filter.pname=Jm\u00E9no procesu obsahuje
administrator.processes.filter.loginname=P\u0159ihla\u0161ovac\u00ED jm\u00E9no obsahuje
administrator.processes.filter.plannedafter=Napl\u00E1nov\u00E1no po
administrator.processes.filter.plannedbefore=Napl\u00E1nov\u00E1no p\u0159ed
administrator.processes.filter.startedafter=Spu\u0161t\u011Bno po
Expand Down
6 changes: 6 additions & 0 deletions search/web/inc/admin/_processes_data.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,12 @@ $(document).ready(function(){
</td>
</tr>

<tr>
<td><span class="ui-icon ui-icon-triangle-1-e"></span></td>
<td><label for="filter-state"><view:msg>administrator.processes.filter.loginname</view:msg>:</label></td>
<td><input type="text" name="loginname" class="filter-vals like" value="${processView.loginNameLike}"></input></td>
</tr>

<tr>
<td><span class="ui-icon ui-icon-triangle-1-e"></span></td>
<td><label for="filter-state"><view:msg>administrator.processes.filter.pname</view:msg>:</label></td>
Expand Down