Skip to content
Snippets Groups Projects
Commit 1c5b01e4 authored by srosse's avatar srosse
Browse files

FXOLAT-282: fix some issues: resource not found in admin, edit button in edit...

FXOLAT-282: fix some issues: resource not found in admin, edit button in edit panel, missing i18n key

--HG--
branch : FXOLAT-282-virtualclassroom
parent a6508ca6
No related branches found
No related tags found
No related merge requests found
...@@ -2,4 +2,5 @@ error.vmsNotAvailable=$com.frentix.olat.vitero.ui\:verror.vmsNotAvailable ...@@ -2,4 +2,5 @@ error.vmsNotAvailable=$com.frentix.olat.vitero.ui\:verror.vmsNotAvailable
table.empty=$com.frentix.olat.vitero.ui\:table.empty table.empty=$com.frentix.olat.vitero.ui\:table.empty
pane.tab.accessibility=Zugang pane.tab.accessibility=Zugang
pane.tab.vcconfig=Konfiguration pane.tab.vcconfig=Konfiguration
condition.accessibility.title=Zugang condition.accessibility.title=Zugang
\ No newline at end of file title_vc=Vitero
\ No newline at end of file
...@@ -151,7 +151,12 @@ public class ViteroBookingsAdminController extends BasicController { ...@@ -151,7 +151,12 @@ public class ViteroBookingsAdminController extends BasicController {
} else { } else {
OLATResourceable ores = OresHelper.createOLATResourceableInstance(prop.getResourceTypeName(), prop.getResourceTypeId()); OLATResourceable ores = OresHelper.createOLATResourceableInstance(prop.getResourceTypeName(), prop.getResourceTypeId());
RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntry(ores, false); RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntry(ores, false);
url = "[RepositoryEntry:" + re.getKey() + "]"; if(re != null) {
url = "[RepositoryEntry:" + re.getKey() + "]";
} else {
showWarning("resource.dont.exist");
return;
}
} }
BusinessControl bc = BusinessControlFactory.getInstance().createFromString(url); BusinessControl bc = BusinessControlFactory.getInstance().createFromString(url);
WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(bc, getWindowControl()); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(bc, getWindowControl());
......
...@@ -102,11 +102,12 @@ public class ViteroBookingsEditController extends FormBasicController { ...@@ -102,11 +102,12 @@ public class ViteroBookingsEditController extends FormBasicController {
protected void reloadModel() { protected void reloadModel() {
bookingDisplays.clear(); bookingDisplays.clear();
List<ViteroBooking> bookings = viteroManager.getBookings(group, ores); List<ViteroBooking> bookings = viteroManager.getBookings(group, ores);
int i=0;
for(ViteroBooking booking:bookings) { for(ViteroBooking booking:bookings) {
BookingDisplay display = new BookingDisplay(booking); BookingDisplay display = new BookingDisplay(booking);
display.setDeleteButton(uifactory.addFormLink("delete", flc, Link.BUTTON)); display.setDeleteButton(uifactory.addFormLink("delete_" + i++, "delete", "delete", flc, Link.BUTTON));
display.setEditButton(uifactory.addFormLink("edit", flc, Link.BUTTON)); display.setEditButton(uifactory.addFormLink("edit_" + i++, "edit", "edit", flc, Link.BUTTON));
display.setUsersButton(uifactory.addFormLink("users", flc, Link.BUTTON)); display.setUsersButton(uifactory.addFormLink("users_" + i++, "users", "users", flc, Link.BUTTON));
bookingDisplays.add(display); bookingDisplays.add(display);
} }
flc.contextPut("bookingDisplays", bookingDisplays); flc.contextPut("bookingDisplays", bookingDisplays);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment