Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e09f6ef3
authored
May 12, 2012
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Le fix...
1 parent
8901b274
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
View file @
e09f6ef
...
...
@@ -306,8 +306,8 @@ public class UserBean implements UserBeanLocal {
@Override
@RolesAllowed
(
UserPermission
.
S_VIEW_ALL
)
public
SearchResult
<
Event
User
>
getUsers
(
int
page
,
int
pagesize
,
String
sort
,
String
search
)
{
return
eventU
serFacade
.
searchUser
(
page
,
pagesize
,
sort
,
search
);
public
SearchResult
<
User
>
getUsers
(
int
page
,
int
pagesize
,
String
sort
,
String
search
)
{
return
u
serFacade
.
searchUser
(
page
,
pagesize
,
sort
,
search
);
}
// @Override
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
View file @
e09f6ef
...
...
@@ -52,7 +52,7 @@ public class PlaceView extends GenericCDIView {
private
EventMap
currentMap
;
private
String
searchuser
;
private
transient
ListDataModel
<
Event
User
>
userlist
;
private
transient
ListDataModel
<
User
>
userlist
;
@EJB
private
AccountEventBeanLocal
acbean
;
...
...
@@ -136,8 +136,8 @@ public class PlaceView extends GenericCDIView {
public
String
reserveForUser
()
{
try
{
EventUser
user
=
user
list
.
getRowData
(
);
if
(
placebean
.
reservePlace
(
place
,
user
list
.
getRowData
()
))
{
EventUser
user
=
user
bean
.
getEventUser
(
userlist
.
getRowData
()
);
if
(
placebean
.
reservePlace
(
place
,
user
))
{
placebean
.
buySelectedPlaces
(
user
);
}
...
...
@@ -152,7 +152,7 @@ public class PlaceView extends GenericCDIView {
public
String
searchUser
()
{
super
.
beginConversation
();
userlist
=
new
ListDataModel
<
Event
User
>(
userbean
.
getUsers
(
0
,
0
,
null
,
searchuser
).
getResults
());
userlist
=
new
ListDataModel
<
User
>(
userbean
.
getUsers
(
0
,
0
,
null
,
searchuser
).
getResults
());
return
null
;
}
...
...
@@ -190,11 +190,11 @@ public class PlaceView extends GenericCDIView {
return
searchuser
;
}
public
void
setUserlist
(
ListDataModel
<
Event
User
>
userlist
)
{
public
void
setUserlist
(
ListDataModel
<
User
>
userlist
)
{
this
.
userlist
=
userlist
;
}
public
ListDataModel
<
Event
User
>
getUserlist
()
{
public
ListDataModel
<
User
>
getUserlist
()
{
return
userlist
;
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment