Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Riina Antikainen
/
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 76b0b752
authored
Jun 18, 2014
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some minor changes
1 parent
078b99e4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
code/MoyaWeb/WebContent/lectures/viewLectures.xhtml
code/MoyaWeb/WebContent/resources/cditools/user/eventuserlist.xhtml
code/MoyaWeb/WebContent/resources/cditools/user/list.xhtml
code/MoyaWeb/src/fi/codecrew/moya/web/lecture/LectureUserView.java
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
View file @
76b0b75
...
...
@@ -297,6 +297,7 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation
adminlectures
=
adminmenu
.
addPage
(
null
,
null
);
adminlectures
.
setKey
(
"topnavi.adminlectures"
);
adminlectures
.
addPage
(
menuitemfacade
.
findOrCreate
(
"/lectureadmin/manageLectureGroups"
),
LecturePermission
.
MANAGE
);
adminlectures
.
addPage
(
menuitemfacade
.
findOrCreate
(
"/lectureadmin/manageLectures"
),
LecturePermission
.
MANAGE
).
setVisible
(
false
);;
...
...
code/MoyaWeb/WebContent/lectures/viewLectures.xhtml
View file @
76b0b75
...
...
@@ -7,7 +7,7 @@
<f:event
type=
"preRenderView"
listener=
"#{lectureUserView.initView()}"
/>
</f:metadata>
<ui:define
name=
"title"
>
<ui:define
rendered=
"#{lectureUserView.lectureGroupsVisible}"
name=
"title"
>
<h1>
#{i18n['viewlectures.title']}
</h1>
</ui:define>
...
...
@@ -15,7 +15,7 @@
<h:form
id=
"viewlecturesform"
>
<p:fieldset
id=
"lectureGroups"
legend=
"#{i18n['lecture.selectgroup']}"
>
<p:fieldset
rendered=
"#{lectureUserView.lectureGroupsVisible}"
id=
"lectureGroups"
legend=
"#{i18n['lecture.selectgroup']}"
>
<p:dataTable
value=
"#{lectureUserView.lectureGroups}"
var=
"lectureGroup"
>
<p:column
headerText=
"#{i18n['lectureGroup.name']}"
>
<h:outputText
value=
"#{lectureGroup.name}"
/>
...
...
@@ -33,7 +33,7 @@
</p:fieldset>
<h1>
<h:outputText
id=
"title"
value=
"#{lectureUserView.currentLectureGroup.name}"
/>
<h:outputText
id=
"title"
value=
"#{lectureUserView.currentLectureGroup.name}"
/>
</h1>
...
...
code/MoyaWeb/WebContent/resources/cditools/user/eventuserlist.xhtml
View file @
76b0b75
...
...
@@ -10,7 +10,7 @@
<p:dataTable
styleClass=
"bordertable"
id=
"usertable"
value=
"#{userSearchView.eventuserModel}"
rows=
"100
0
"
paginator=
"true"
lazy=
"true"
var=
"user"
>
<p:dataTable
styleClass=
"bordertable"
id=
"usertable"
value=
"#{userSearchView.eventuserModel}"
rows=
"100"
paginator=
"true"
lazy=
"true"
var=
"user"
>
<p:column
headerText=
"#{i18n['user.nick']}"
sortBy=
"#{user.nick}"
>
<h:outputText
styleClass=
"hoverable"
value=
"#{(empty user.nick)?'----':user.nick}"
/>
...
...
code/MoyaWeb/WebContent/resources/cditools/user/list.xhtml
View file @
76b0b75
...
...
@@ -9,7 +9,7 @@
<composite:implementation>
<h:outputScript
library=
"primefaces"
name=
"jquery/jquery.js"
target=
"head"
/>
<p:dataTable
id=
"user"
value=
"#{userSearchView.userModel}"
rows=
"
5
00"
var=
"wra"
paginator=
"true"
lazy=
"true"
>
<p:dataTable
id=
"user"
value=
"#{userSearchView.userModel}"
rows=
"
1
00"
var=
"wra"
paginator=
"true"
lazy=
"true"
>
<p:column
sortBy=
"#{wra.user.nick}"
headerText=
"#{i18n['user.nick']}"
>
<h:outputText
value=
"#{(empty wra.user.nick)?'----':wra.user.nick}"
/>
...
...
code/MoyaWeb/src/fi/codecrew/moya/web/lecture/LectureUserView.java
View file @
76b0b75
...
...
@@ -43,6 +43,12 @@ public class LectureUserView extends GenericCDIView {
super
.
beginConversation
();
}
}
public
boolean
isLectureGroupsVisible
()
{
if
(
lectureBean
.
getLectureGroups
().
size
()
<=
1
)
return
false
;
return
true
;
}
public
ListDataModel
<
LectureGroup
>
getLectureGroups
()
{
lectureGroups
=
new
ListDataModel
<
LectureGroup
>(
lectureBean
.
getLectureGroups
());
...
...
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