XAMEETINGS-148 : Don't display PARTICIPATING GROUPS field if value is empty #15 #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
evalica
reviewed
Jul 13, 2018
| ; <label for="Meeting.Code.MeetingClass_0_groups">$!services.icon.render('group') $services.localization.render('contrib.meeting.field.groups')</label>## | ||
| #if ($xcontext.action == 'edit') | ||
| #if ($xcontext.action == 'edit' || $doc.getValue('groups') != '') | ||
| ; <label for="Meeting.Code.MeetingClass_0_groups">$!services.icon.render('group') $services.localization.render('contrib.meeting.field.groups')</label>## | ||
| (% class="xHint" %)$services.localization.render('') |
There was a problem hiding this comment.
This is rendering an empty string, is there any translation associated to that label?
acotiuga
reviewed
Jul 13, 2018
| @@ -236,19 +236,19 @@ | |||
| #end | |||
| : $doc.display('participants') | |||
| ## groups | |||
| ; <label for="Meeting.Code.MeetingClass_0_groups">$!services.icon.render('group') $services.localization.render('contrib.meeting.field.groups')</label>## | |||
| #if ($xcontext.action == 'edit') | |||
| #if ($xcontext.action == 'edit' || $doc.getValue('groups') != '') | |||
There was a problem hiding this comment.
The right check here would be "$!doc.getValue('groups')" != ''.
acotiuga
reviewed
Jul 13, 2018
| ; <label for="Meeting.Code.MeetingClass_0_groups">$!services.icon.render('group') $services.localization.render('contrib.meeting.field.groups')</label>## | ||
| #if ($xcontext.action == 'edit') | ||
| #if ($xcontext.action == 'edit' || $doc.getValue('groups') != '') | ||
| ; <label for="Meeting.Code.MeetingClass_0_groups">$!services.icon.render('group') $services.localization.render('contrib.meeting.field.groups')</label>## |
There was a problem hiding this comment.
Please indent here the code, so it stays in max 120 chars in a line.
acotiuga
reviewed
Jul 13, 2018
| @@ -112,7 +112,9 @@ | |||
| #set ($title = $doc.getValue('meetingTitle')) | |||
| #end | |||
| #set ($meetingTitleId = 'Meeting.Code.MeetingClass_0_meetingTitle') | |||
| ; <label for="">$!services.icon.render('font') $services.localization.render('contrib.meeting.field.meetingTitle')</label> | |||
| ; <label for=""> | |||
There was a problem hiding this comment.
the value in the for attribute is empty and the label won't work properly.
evalica
reviewed
Jul 19, 2018
| $!services.icon.render('user') $services.localization.render('contrib.meeting.field.leader') | ||
| </label> | ||
| : $doc.display('leader') | ||
| #if ($xcontext.action == 'edit' || "$!doc.getValue('leader')" != '') |
There was a problem hiding this comment.
There is a lot of duplication. You could also write a macro with some parameters to handle multiple fields.
|
Also first fix the conflict. |
… empty #15 *created a macro to avoid duplication
…ion-meeting into XAMEETINGS-148
… empty #15 *small fixes
acotiuga
reviewed
Jul 20, 2018
| @@ -94,6 +107,8 @@ | |||
| #set($newPollReference = $services.model.createDocumentReference('', 'XPoll', $title)) | |||
| $response.sendRedirect($xwiki.getURL($newPollReference, 'edit', "$!{request.queryString}")) | |||
| #end | |||
| ##if ($doc.getObject('Meeting.Code.MeetingClass')) | |||
| #set ($job = $doc.getObject('Meeting.Code.MeetingClass')) | |||
There was a problem hiding this comment.
$job name doesn't seem to make any sense here. Instead, you could use $obj.
… empty #15 *small fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.