Merge branch 'develop' into release-firefighting

This commit is contained in:
Andreas Svanberg 2024-11-19 14:32:02 +01:00
commit 3809c4ef68
2 changed files with 3 additions and 6 deletions
view/src/main/java/se/su/dsv/scipro/supervisor/panels

@ -6,7 +6,7 @@
<div wicket:id="feedback"></div>
<div class="mb-3">
<label wicket:for="note" class="sr-only">Note</label>
<textarea wicket:id="note" rows="20" class="form-control"></textarea>
<textarea wicket:id="note" rows="7" class="form-control"></textarea>
</div>
<button wicket:id="save" type="submit" class="btn btn-primary">Save</button>
</form>

@ -51,11 +51,8 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String>
}
@Override
public void populateItem(
Item<ICellPopulator<Project>> cellItem,
String componentId,
IModel<Project> rowModel)
{
public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,
IModel<Project> rowModel) {
cellItem.add(new ViewAndEditNoteCellPanel(componentId, rowModel));
}