Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 7d22508c by Antti Tönkyrä
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents 2d07822b 0af7b2aa
Inline Side-by-side
Showing with 60 additions and 29 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
...@@ -82,8 +82,6 @@ public class MenuBean implements MenuBeanLocal { ...@@ -82,8 +82,6 @@ public class MenuBean implements MenuBeanLocal {
frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false); frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false);
frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false); frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false);
MenuNavigation userTopnavi = usernavi.addPage(null, null); MenuNavigation userTopnavi = usernavi.addPage(null, null);
userTopnavi.setKey("topnavi.user"); userTopnavi.setKey("topnavi.user");
userTopnavi.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF).setHeader("submenu.user.userlinks"); userTopnavi.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF).setHeader("submenu.user.userlinks");
...@@ -95,10 +93,11 @@ public class MenuBean implements MenuBeanLocal { ...@@ -95,10 +93,11 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation placemapTopmenu = usernavi.addPage(null, null); MenuNavigation placemapTopmenu = usernavi.addPage(null, null);
placemapTopmenu.setKey("topnavi.placemap"); placemapTopmenu.setKey("topnavi.placemap");
placemapTopmenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW); placemapTopmenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
MenuNavigation actionlogTopmenu = usernavi.addPage(null,null); // MenuNavigation actionlogTopmenu = usernavi.addPage(null, null);
actionlogTopmenu.setKey("topnavi.actionlog"); // actionlogTopmenu.setKey("topnavi.actionlog");
actionlogTopmenu.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), ContentPermission.MANAGE_ACTIONLOG); // actionlogTopmenu.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"),
// ContentPermission.MANAGE_ACTIONLOG);
MenuNavigation shopTopmenu = usernavi.addPage(null, null); MenuNavigation shopTopmenu = usernavi.addPage(null, null);
shopTopmenu.setKey("topnavi.shop"); shopTopmenu.setKey("topnavi.shop");
...@@ -106,7 +105,6 @@ public class MenuBean implements MenuBeanLocal { ...@@ -106,7 +105,6 @@ public class MenuBean implements MenuBeanLocal {
shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN); shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/edit"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/edit"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/showBill"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/showBill"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/svm/failure"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/svm/failure"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/svm/notification"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/svm/notification"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/svm/pending"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/svm/pending"), null).setVisible(false);
...@@ -115,10 +113,10 @@ public class MenuBean implements MenuBeanLocal { ...@@ -115,10 +113,10 @@ public class MenuBean implements MenuBeanLocal {
shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/delayed"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/delayed"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/reject"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/reject"), null).setVisible(false);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/return"), null).setVisible(false); shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/return"), null).setVisible(false);
MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null); MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null);
foodwaveTopmenu.setKey("topnavi.foodwave"); foodwaveTopmenu.setKey("topnavi.foodwave");
foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), BillPermission.VIEW_OWN); foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
MenuNavigation pollTopmenu = usernavi.addPage(null, null); MenuNavigation pollTopmenu = usernavi.addPage(null, null);
pollTopmenu.setKey("topnavi.poll"); pollTopmenu.setKey("topnavi.poll");
...@@ -134,6 +132,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -134,6 +132,7 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation adminnavi = new MenuNavigation(ev, "supernavi.admin"); MenuNavigation adminnavi = new MenuNavigation(ev, "supernavi.admin");
navifacade.create(adminnavi); navifacade.create(adminnavi);
MenuNavigation adminuser = adminnavi.addPage(null, null); MenuNavigation adminuser = adminnavi.addPage(null, null);
adminuser.setKey("topnavi.usermgmt"); adminuser.setKey("topnavi.usermgmt");
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks"); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
...@@ -147,6 +146,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -147,6 +146,7 @@ public class MenuBean implements MenuBeanLocal {
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"), UserPermission.WRITE_ROLES); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"), UserPermission.WRITE_ROLES);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false);
...@@ -154,6 +154,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -154,6 +154,7 @@ public class MenuBean implements MenuBeanLocal {
adminuser.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/place/adminInsertToken"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/place/adminInsertToken"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/sendPicture"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/sendPicture"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/showTakePicture"), UserPermission.VIEW_ALL).setHeader("submenu.user.other");
// MenuNavigation initUser = adminnavi.addPage(null, null); // MenuNavigation initUser = adminnavi.addPage(null, null);
// initUser.setKey("topnavi.userinit"); // initUser.setKey("topnavi.userinit");
...@@ -163,7 +164,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -163,7 +164,7 @@ public class MenuBean implements MenuBeanLocal {
usershop.setKey("topnavi.adminshop"); usershop.setKey("topnavi.adminshop");
usershop.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS); usershop.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS);
usershop.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS); usershop.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS);
usershop.addPage(menuitemfacade.findOrCreate("/shop/editReader"), ShopPermission.SHOP_TO_OTHERS); usershop.addPage(menuitemfacade.findOrCreate("/shop/editReader"), ShopPermission.SHOP_TO_OTHERS).setVisible(false);
MenuNavigation billnavi = adminnavi.addPage(null, null); MenuNavigation billnavi = adminnavi.addPage(null, null);
billnavi.setKey("topnavi.billing"); billnavi.setKey("topnavi.billing");
...@@ -189,6 +190,11 @@ public class MenuBean implements MenuBeanLocal { ...@@ -189,6 +190,11 @@ public class MenuBean implements MenuBeanLocal {
contentnavi.addPage(menuitemfacade.findOrCreate("/pages/create"), ContentPermission.MANAGE_PAGES); contentnavi.addPage(menuitemfacade.findOrCreate("/pages/create"), ContentPermission.MANAGE_PAGES);
contentnavi.addPage(menuitemfacade.findOrCreate("/pages/edit"), null).setVisible(false); contentnavi.addPage(menuitemfacade.findOrCreate("/pages/edit"), null).setVisible(false);
MenuNavigation lognavi = adminnavi.addPage(null, null);
lognavi.setKey("topnavi.log");
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), UserPermission.VIEW_ALL);
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false);
} }
@Override @Override
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation.java
...@@ -181,12 +181,16 @@ public class MenuNavigation extends GenericEntity implements Comparable<MenuNavi ...@@ -181,12 +181,16 @@ public class MenuNavigation extends GenericEntity implements Comparable<MenuNavi
return sort.compareTo(o.sort); return sort.compareTo(o.sort);
} }
@Transient
private transient Integer pagesort = 0;
// used only for initialization function... // used only for initialization function...
public MenuNavigation addPage(Menuitem item, IAppPermission permission) { public MenuNavigation addPage(Menuitem item, IAppPermission permission) {
if (children == null) { if (children == null) {
children = new ArrayList<MenuNavigation>(); children = new ArrayList<MenuNavigation>();
} }
MenuNavigation add = new MenuNavigation(); MenuNavigation add = new MenuNavigation();
add.setSort(pagesort += 10);
if (item != null) if (item != null)
{ {
add.setKey("submenu" + item.getUrl().replace("/", ".")); add.setKey("submenu" + item.getUrl().replace("/", "."));
......
code/LanBortalWeb/WebContent/error.xhtml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</p> </p>
<!-- </c:if> --> <!-- </c:if> -->
<br/><br/> <br/><br/>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <ui:fragment rendered="#{sessionHandler.isInDevelopmentMode()}">
<br/> <br/>
<center> <center>
<img src="#{request.contextPath}/resources/media/error.jpg" /> <img src="#{request.contextPath}/resources/media/error.jpg" />
...@@ -23,6 +23,6 @@ ...@@ -23,6 +23,6 @@
<br/> <br/>
</center> </center>
<h:outputText escape="false" value="#{errorPageView.stackTrace}" /> <h:outputText escape="false" value="#{errorPageView.stackTrace}" />
</c:when> </ui:fragment>
</h:body> </h:body>
</html> </html>
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
...@@ -117,11 +117,11 @@ permissiondenied.notLoggedIn = You don't have enough rights to enter this si ...@@ -117,11 +117,11 @@ permissiondenied.notLoggedIn = You don't have enough rights to enter this si
placegroupview.toptext = \ placegroupview.toptext = \
poll.edit = edit poll.edit = edit
product.providedRole = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin product.providedRole = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
product.returnProductEdit = Palaa tuotteeseen: product.returnProductEdit = Palaa tuotteeseen:
product.saved = Tuote tallennettu product.saved = Tuote tallennettu
productshop.minusOne = -1 productshop.minusOne = -1
productshop.minusTen = -10 productshop.minusTen = -10
...@@ -136,4 +136,4 @@ resetMail.username = Username ...@@ -136,4 +136,4 @@ resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password. resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent resetmailSent.header = Email sent
user.unauthenticated = Kirjautumaton user.unauthenticated = Kirjautumaton
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -588,6 +588,7 @@ submenu.user.create = Create new user ...@@ -588,6 +588,7 @@ submenu.user.create = Create new user
submenu.user.edit = User information submenu.user.edit = User information
submenu.user.invite = Invite friends submenu.user.invite = Invite friends
submenu.user.manageuserlinks = Manage users submenu.user.manageuserlinks = Manage users
submenu.user.other = Other
submenu.user.rolelinks = Manage roles submenu.user.rolelinks = Manage roles
submenu.user.sendPicture = Send picture submenu.user.sendPicture = Send picture
submenu.user.shop = Shop submenu.user.shop = Shop
...@@ -596,6 +597,7 @@ submenu.useradmin.create = Create user ...@@ -596,6 +597,7 @@ submenu.useradmin.create = Create user
submenu.useradmin.createCardTemplate = Create cardtemplate submenu.useradmin.createCardTemplate = Create cardtemplate
submenu.useradmin.list = List users submenu.useradmin.list = List users
submenu.useradmin.listCardTemplates = Card templates submenu.useradmin.listCardTemplates = Card templates
submenu.useradmin.showTakePicture = Show webcam
submenu.useradmin.validateUser = Validate user submenu.useradmin.validateUser = Validate user
submenu.voting.compolist = Compos submenu.voting.compolist = Compos
submenu.voting.create = Create new compo submenu.voting.create = Create new compo
...@@ -617,7 +619,9 @@ topnavi.adminshop = Adminshop ...@@ -617,7 +619,9 @@ topnavi.adminshop = Adminshop
topnavi.billing = Billing topnavi.billing = Billing
topnavi.compos = Compos topnavi.compos = Compos
topnavi.contents = Site contents topnavi.contents = Site contents
topnavi.foodwave = Food
topnavi.frontpage = Front page topnavi.frontpage = Front page
topnavi.log = Log
topnavi.maps = Maps topnavi.maps = Maps
topnavi.placemap = Map topnavi.placemap = Map
topnavi.poll = Polls topnavi.poll = Polls
...@@ -696,14 +700,20 @@ userImport.commit = Commit ...@@ -696,14 +700,20 @@ userImport.commit = Commit
userView.image = Image userView.image = Image
usercart.addSearchedUsers = Add searched users
usercart.cartsize = Size
usercart.showCart = Show usercart
usercart.traverse = Traverse
userimage.webcam = Take picture with webcam userimage.webcam = Take picture with webcam
userlist.header = Users userlist.header = Users
userlist.onlythisevent = Limit to users of this event userlist.onlythisevent = Limit to users of this event
userlist.placeassoc = Assigned to place userlist.placeassoc = Assigned to place
userlist.rolefilter = Assigned roles userlist.rolefilter = Assigned roles
userlist.saldofilter = Saldo userlist.saldofilter = Saldo
userlist.search = Search userlist.search = Search
userlist.showAdvancedSearch = Advanced search
usertitle.managingUser = Shop usertitle.managingUser = Shop
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -575,6 +575,7 @@ submenu.user.invite = Kutsu yst\u00E4vi\u00E4 ...@@ -575,6 +575,7 @@ submenu.user.invite = Kutsu yst\u00E4vi\u00E4
submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t
submenu.user.listCardTemplates = Korttiryhm\u00E4t submenu.user.listCardTemplates = Korttiryhm\u00E4t
submenu.user.manageuserlinks = Hallitse k\u00E4ytt\u00E4ji\u00E4 submenu.user.manageuserlinks = Hallitse k\u00E4ytt\u00E4ji\u00E4
submenu.user.other = Muuta
submenu.user.rolelinks = Hallitse rooleja submenu.user.rolelinks = Hallitse rooleja
submenu.user.sendPicture = L\u00E4het\u00E4 kuva submenu.user.sendPicture = L\u00E4het\u00E4 kuva
submenu.user.shop = Kauppaan submenu.user.shop = Kauppaan
...@@ -583,6 +584,7 @@ submenu.useradmin.create = Luo uusi k\u00E4ytt\u00E4j\u00E4 ...@@ -583,6 +584,7 @@ submenu.useradmin.create = Luo uusi k\u00E4ytt\u00E4j\u00E4
submenu.useradmin.createCardTemplate = Luo uusi korttipohja submenu.useradmin.createCardTemplate = Luo uusi korttipohja
submenu.useradmin.list = Listaa k\u00E4ytt\u00E4j\u00E4t submenu.useradmin.list = Listaa k\u00E4ytt\u00E4j\u00E4t
submenu.useradmin.listCardTemplates = Listaa korttipohjat submenu.useradmin.listCardTemplates = Listaa korttipohjat
submenu.useradmin.showTakePicture = N\u00E4yt\u00E4 webcam
submenu.useradmin.validateUser = Validoi k\u00E4ytt\u00E4j\u00E4 submenu.useradmin.validateUser = Validoi k\u00E4ytt\u00E4j\u00E4
submenu.voting.compolist = Kilpailut submenu.voting.compolist = Kilpailut
submenu.voting.create = Uusi kilpailu submenu.voting.create = Uusi kilpailu
...@@ -604,7 +606,9 @@ topnavi.adminshop = Kauppa ...@@ -604,7 +606,9 @@ topnavi.adminshop = Kauppa
topnavi.billing = Laskutus topnavi.billing = Laskutus
topnavi.compos = Kilpailut topnavi.compos = Kilpailut
topnavi.contents = Sivuston sis\u00E4lt\u00F6 topnavi.contents = Sivuston sis\u00E4lt\u00F6
topnavi.foodwave = Ruokatilaus
topnavi.frontpage = Etusivu topnavi.frontpage = Etusivu
topnavi.log = Logi
topnavi.maps = Kartat topnavi.maps = Kartat
topnavi.placemap = Paikkakartta topnavi.placemap = Paikkakartta
topnavi.poll = Kyselyt topnavi.poll = Kyselyt
...@@ -681,14 +685,20 @@ userImport.commit = Hyv\u00E4ksy ...@@ -681,14 +685,20 @@ userImport.commit = Hyv\u00E4ksy
userView.image = Kuva userView.image = Kuva
usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t
usercart.cartsize = Koko
usercart.showCart = K\u00E4ytt\u00E4j\u00E4kori
usercart.traverse = K\u00E4y l\u00E4pi
userimage.webcam = Ota kuva webkameralla userimage.webcam = Ota kuva webkameralla
userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4 userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4
userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
userlist.placeassoc = Liitetty paikkaan userlist.placeassoc = Liitetty paikkaan
userlist.rolefilter = Annetut roolit userlist.rolefilter = Annetut roolit
userlist.saldofilter = Tilin saldo userlist.saldofilter = Tilin saldo
userlist.search = Etsi userlist.search = Etsi
userlist.showAdvancedSearch = Tarkennettu haku
usertitle.managingUser = Kauppa usertitle.managingUser = Kauppa
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!