You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by es...@apache.org on 2012/02/24 02:38:09 UTC
svn commit: r1293054 - in
/incubator/openmeetings/branches/jira-plugin/src/main:
java/org/openmeetings/jira/plugin/gateway/
java/org/openmeetings/jira/plugin/jira/customfields/ resources/
resources/templates/omrooms/
Author: eschwert
Date: Fri Feb 24 01:38:08 2012
New Revision: 1293054
URL: http://svn.apache.org/viewvc?rev=1293054&view=rev
Log:
OPENMEETINGS-60 getRoomsByUserId for custom field
Modified:
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java
incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/enter.vm
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java?rev=1293054&r1=1293053&r2=1293054&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmRestService.java Fri Feb 24 01:38:08 2012
@@ -82,7 +82,7 @@ public class OmRestService {
}
- default: System.out.println("Your call to Yahoo! Web Services returned an unexpected HTTP status of: " + statusCode);
+ default: System.out.println("Your call to OpenMeetings! Web Services returned an unexpected HTTP status of: " + statusCode);
}
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java?rev=1293054&r1=1293053&r2=1293054&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java Fri Feb 24 01:38:08 2012
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Map;
//import com.atlassian.jira.issue.customfields.impl.AbstractSingleFieldType;
+import com.atlassian.crowd.embedded.api.User;
+import com.atlassian.jira.ComponentManager;
import com.atlassian.jira.issue.Issue;
import com.atlassian.jira.issue.customfields.impl.SelectCFType;
import com.atlassian.jira.util.ErrorCollection;
@@ -54,7 +56,10 @@ import com.atlassian.jira.issue.fields.l
@Override
public Map<String, Object> getVelocityParameters(final Issue issue,
final CustomField field,
- final FieldLayoutItem fieldLayoutItem) {
+ final FieldLayoutItem fieldLayoutItem)
+ {
+
+ User currentUser = ComponentManager.getInstance().getJiraAuthenticationContext().getLoggedInUser();
final Map<String, Object> map = super.getVelocityParameters(issue, field, fieldLayoutItem);
// This method is also called to get the default value, in
@@ -63,7 +68,8 @@ import com.atlassian.jira.issue.fields.l
return map;
}
//FieldConfig fieldConfig = field.getRelevantConfig(issue);
- List<Room> rooms = roomService.allNotDeleted();
+ //List<Room> rooms = roomService.allNotDeleted();
+ List<Room> rooms = roomService.allNotDeletedByUserName(currentUser.toString());
map.put("rooms", rooms);
return map;
}
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties?rev=1293054&r1=1293053&r2=1293054&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties Fri Feb 24 01:38:08 2012
@@ -1,7 +1,6 @@
openmeetings.admin.label=OpenMeetings Admin
openmeetings.admin.name.label=Name
-openmeetings.admin.time.label=Time
openmeetings.admin.save.label=Save
openmeetings.rooms.conference.label=Conference
@@ -44,3 +43,4 @@ openmeetings.config.username.label=Usern
openmeetings.config.userpass.label=Userpass
openmeetings.config.key.label=Key
+openmeetings.rooms.enter.titel.label=OpenMeetings Room
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/enter.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/enter.vm?rev=1293054&r1=1293053&r2=1293054&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/enter.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/enter.vm Fri Feb 24 01:38:08 2012
@@ -1,6 +1,6 @@
<html>
<head>
- <title>Edit Issue — Issue CRUD Tutorial</title>
+ <title>$i18n.getText("openmeetings.rooms.edit.titel.label")</title>
<meta name="decorator" content="atl.general">
</head>
<body class="page-type-admin">