Modified: incubator/openmeetings/branches/jira-plugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/pom.xml?rev=1296684&r1=1296683&r2=1296684&view=diff ============================================================================== --- incubator/openmeetings/branches/jira-plugin/pom.xml (original) +++ incubator/openmeetings/branches/jira-plugin/pom.xml Sat Mar 3 19:55:27 2012 @@ -122,8 +122,8 @@ </dependencies> <properties> <amps.version>3.7.2</amps.version> - <jira.version>4.4.1</jira.version> - <jira.data.version>4.4</jira.data.version> + <jira.version>5.0</jira.version> + <jira.data.version>5.0</jira.data.version> </properties> </project>
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=1296684&r1=1296683&r2=1296684&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 Sat Mar 3 19:55:27 2012 @@ -59,7 +59,7 @@ import com.atlassian.jira.issue.fields.C import com.atlassian.jira.issue.fields.config.FieldConfig; import com.atlassian.jira.issue.fields.layout.field.FieldLayoutItem; - public class RoomSelectList extends TextCFType { + public class RoomSelectList extends AbstractSingleFieldType<Integer> { private static final Logger log = LoggerFactory.getLogger(RoomSelectList.class); @@ -79,18 +79,19 @@ import com.atlassian.jira.issue.fields.l 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 // which case issue is null so we can't use it to add currencyLocale if (issue == null) { return map; - } + } //FieldConfig fieldConfig = field.getRelevantConfig(issue); //List<Room> rooms = roomService.allNotDeleted(); if(currentUser != null){ - List<Room> rooms = roomService.allNotDeletedByUserName(currentUser.toString()); + //List<Room> rooms = roomService.allNotDeleted(); + List<Room> rooms = roomService.allNotDeletedByUserName(currentUser.getName()); map.put("rooms", rooms); - } + } return map; } @@ -127,7 +128,7 @@ import com.atlassian.jira.issue.fields.l } @Override - public String getStringFromSingularObject(Object singularObject) { + public String getStringFromSingularObject(Integer singularObject) { if (singularObject == null) return ""; // format @@ -135,8 +136,9 @@ import com.atlassian.jira.issue.fields.l } @Override - protected Object getDbValueFromObject(Object customFieldObject) { + protected Object getDbValueFromObject(Integer customFieldObject) { // TODO Auto-generated method stub return getStringFromSingularObject(customFieldObject); } + } \ No newline at end of file Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.properties URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.properties?rev=1296684&r1=1296683&r2=1296684&view=diff ============================================================================== --- incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.properties (original) +++ incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.properties Sat Mar 3 19:55:27 2012 @@ -1,14 +1,9 @@ # #Tue Feb 21 00:25:25 CET 2012 -room-select-list.description=The Room Select List Plugin -room-name-field.name=Room Name Field -room-name-field.description=The Room Name Field Plugin -room-select-list.name=Room Select List -openmeetings-crud.name=Openmeetings CRUD +room-select-list.description=The OpenMeetings Room Select List Plugin +room-select-list.name=OpenMeetings Room Select List my-class.description=The My Class Plugin my-class.name=My Class -openmeetings-crud.description=The Openmeetings CRUD Plugin - openmeetings.admin.label=OpenMeetings Admin openmeetings.admin.name.label=Name Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml?rev=1296684&r1=1296683&r2=1296684&view=diff ============================================================================== --- incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml (original) +++ incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml Sat Mar 3 19:55:27 2012 @@ -61,7 +61,7 @@ <component-import key="templateRenderer" interface="com.atlassian.templaterenderer.TemplateRenderer"/> <component-import key="userManager" interface="com.atlassian.sal.api.user.UserManager"/> - <customfield-type name="Room Select List" i18n-name-key="room-select-list.name" key="room-select-list" class="org.openmeetings.jira.plugin.jira.customfields.RoomSelectList"> + <customfield-type name="OpenMeetings Room Select List" i18n-name-key="room-select-list.name" key="room-select-list" class="org.openmeetings.jira.plugin.jira.customfields.RoomSelectList"> <description key="room-select-list.description">The Room Select List Plugin allow to select one OpenMeetings room from roomlist.</description> <resource name="view" type="velocity" location="/templates/customfields/room-select-list/view.vm"/> <resource name="edit" type="velocity" location="/templates/customfields/room-select-list/edit.vm"/>
