Permalink
Browse files

Automatic link to Page of participant

  • Loading branch information...
1 parent 87b6fe2 commit 0bda2ac0ce9093b57fde230d9bcb7f2b42696b72 Rafael Breu committed Dec 10, 2011
Showing with 5 additions and 71 deletions.
  1. +2 −68 app/models/ESEUser.java
  2. +2 −2 app/views/tags/calendarView.html
  3. +1 −1 app/views/tags/showParticipants.html
View
@@ -181,71 +181,6 @@ public int getUserID()
/**
*
- * @return {@link String} username of this ESEUser, specified by its ESEProfile.
- */
- public String getName()
- {
- return this.profile.getUsername();
- }
-
- /**
- *
- * @return {@link String} password of this ESEUser.
- */
- public String getPassword()
- {
- return this.password;
- }
-
- /**
- *
- * @return {@link String} firstName of this ESEUser.
- */
- public String getFirstName()
- {
- return this.profile.getFirstName();
- }
-
- /**
- *
- * @return {@link String} familyName of this ESEUser.
- */
- public String getFamilyName()
- {
- return this.profile.getFamilyName();
- }
-
- /**
- *
- * @return {@link ESEProfile} containing this ESEUsers personal informations.
- *
- * @see ESEProfile
- */
- public ESEProfile getProfile()
- {
- return this.profile;
- }
-
- /**
- *
- * @return {@link String} that contains the Question.
- */
- public String getQuestion()
- {
- return this.secureQuestion;
- }
-
- /**
- *
- * @return {@link String} that contains the Answer.
- */
- public String getAnswer()
- {
- return this.secureAnswer;
- }
-
- /**
- *
* @return {@link ArrayList} of type {@link ESEGroup}. This is a
* shallow copy, so changes made within this ArrayList will not
* affect the real Data.
@@ -727,12 +662,11 @@ public String getQuestion()
public String getAnswer()
{
return this.secureAnswer;
-=======
+ }
@Override
public String toString()
{
- return this.profile.getUsername();
->>>>>>> 7cd423adb5a13ac8146ef8e1b7e496fa29788881
+ return this.getName();
}
}
@@ -76,10 +76,10 @@
#{/if}
#{if event.getCorrespondingCalendar().getOwner().equals(_currentUser)}
- <a href="@{Application.editEvent(event.getCorrespondingCalendar().getID(), event.getEventID(), _selectedDay, _month, _year)}"> Edit </a>
+ <a href="@{Application.editEvent(event.getCorrespondingCalendar().getID(), event.getEventID(), _selectedDay, _month, _year)}"> Edit Event</a>
#{/if}
#{if _calendar.getOwner().equals(_currentUser)}
- " "<a href="@{Application.removeEvent(_calendar.getID(), event.getEventID(), _selectedDay, _month, _year)}">Remove </a>
+ <span style="color:white">e</span><a href="@{Application.removeEvent(_calendar.getID(), event.getEventID(), _selectedDay, _month, _year)}">Remove Event</a>
#{/if}
#{/if}
@@ -3,7 +3,7 @@
Participants of the event:
<ul>
#{list items:_participants, as:'participant'}
- <li><p>${participant.toString()}</p></li>
+ <li><a href="@{Application.showOtherCalendars(participant.getName())}">${participant.getName()}</a></li>
#{/list}
<ul>

0 comments on commit 0bda2ac

Please sign in to comment.