jro_apps/redmine Commit - r3217:002f440bcd34

Move ids in XML views....

Jean-Philippe Lang -

r3217:002f440bcd34

parent child

Context file:

r3217:002f440bcd34

Collapse all files

app/views/issues/index.xml.builder +2 -1

             xml.instruct!
             xml.issues :type => 'array', :count => @issue_count do
               @issues.each do |issue|
-            	    xml.issue :id => issue.id do
+            	  xml.issue do
+            	    xml.id					issue.id
             			xml.project(:id => issue.project_id, :name => issue.project.name) unless issue.project.nil?
             			xml.tracker(:id => issue.tracker_id, :name => issue.tracker.name) unless issue.tracker.nil?
             			xml.status(:id => issue.status_id, :name => issue.status.name) unless issue.status.nil?
             			xml.priority(:id => issue.priority_id, :name => issue.priority.name) unless issue.priority.nil?
             		 	xml.author(:id => issue.author_id, :name => issue.author.name) unless issue.author.nil?
             		 	xml.assigned_to(:id => issue.assigned_to_id, :name => issue.assigned_to.name) unless issue.assigned_to.nil?
             		  xml.category(:id => issue.category_id, :name => issue.category.name) unless issue.category.nil?
             		  xml.fixed_version(:id => issue.fixed_version_id, :name => issue.fixed_version.name) unless issue.fixed_version.nil?
                   xml.subject 		issue.subject
                   xml.description issue.description
                   xml.start_date 	issue.start_date
                   xml.due_date 		issue.due_date
                   xml.done_ratio 	issue.done_ratio
                   xml.estimated_hours issue.estimated_hours
                   xml.custom_fields do
                   	issue.custom_field_values.each do |custom_value|
                   		xml.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
                   	end
                   end
                   xml.created_on issue.created_on
                   xml.updated_on issue.updated_on
                 end
               end
             end

app/views/issues/show.xml.builder +2 -1

             xml.instruct!
-            xml.issue :id => @issue.id do
+            xml.issue do
+              xml.id					@issue.id
             	xml.project(:id => @issue.project_id, :name => @issue.project.name) unless @issue.project.nil?
             	xml.tracker(:id => @issue.tracker_id, :name => @issue.tracker.name) unless @issue.tracker.nil?
             	xml.status(:id => @issue.status_id, :name => @issue.status.name) unless @issue.status.nil?
             	xml.priority(:id => @issue.priority_id, :name => @issue.priority.name) unless @issue.priority.nil?
              	xml.author(:id => @issue.author_id, :name => @issue.author.name) unless @issue.author.nil?
              	xml.assigned_to(:id => @issue.assigned_to_id, :name => @issue.assigned_to.name) unless @issue.assigned_to.nil?
               xml.category(:id => @issue.category_id, :name => @issue.category.name) unless @issue.category.nil?
               xml.fixed_version(:id => @issue.fixed_version_id, :name => @issue.fixed_version.name) unless @issue.fixed_version.nil?
               xml.subject 		@issue.subject
               xml.description @issue.description
               xml.start_date 	@issue.start_date
               xml.due_date 		@issue.due_date
               xml.done_ratio 	@issue.done_ratio
               xml.estimated_hours @issue.estimated_hours
               if User.current.allowed_to?(:view_time_entries, @project)
               	xml.spent_hours		@issue.spent_hours
              	end
               xml.custom_fields do
               	@issue.custom_field_values.each do |custom_value|
               		xml.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
               	end
               end unless @issue.custom_field_values.empty?
               xml.created_on @issue.created_on
               xml.updated_on @issue.updated_on
               xml.changesets do
               	@issue.changesets.each do |changeset|
               		xml.changeset :revision => changeset.revision do
               			xml.user(:id => changeset.user_id, :name => changeset.user.name) unless changeset.user.nil?
               			xml.comments changeset.comments
               			xml.committed_on changeset.committed_on
               		end
               	end
               end if User.current.allowed_to?(:view_changesets, @project) && @issue.changesets.any?
               xml.journals do
               	@issue.journals.each do |journal|
               		xml.journal :id => journal.id do
             			 	xml.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
               			xml.notes journal.notes
               			xml.details do
               				journal.details.each do |detail|
               					xml.detail :property => detail.property, :name => detail.prop_key, :old => detail.old_value, :new => detail.value
               				end
               			end
               		end
               	end
               end unless @issue.journals.empty?
             end

app/views/projects/index.xml.builder +2 -1

             xml.instruct!
             xml.projects :type => 'array' do
               @projects.each do |project|
-            	  xml.project :id => project.id do
+            	  xml.project do
+            	    xml.id					project.id
             			xml.name				project.name
             			xml.identifier	project.identifier
             			xml.description project.description
             			xml.parent(:id => project.parent_id, :name => project.parent.name) unless project.parent.nil?
             			xml.custom_fields do
                   	project.custom_field_values.each do |custom_value|
                   		xml.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
                   	end
                   end unless project.custom_field_values.empty?
                   xml.created_on 	project.created_on
                   xml.updated_on 	project.updated_on
                 end
               end
             end

app/views/projects/show.xml.builder +2 -1

             xml.instruct!
-            xml.project :id => @project.id do
+            xml.project do
+              xml.id					@project.id
               xml.name		 		@project.name
               xml.identifier	@project.identifier
               xml.description @project.description
               xml.homepage		@project.homepage
               xml.custom_fields do
               	@project.custom_field_values.each do |custom_value|
               		xml.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
               	end
               end unless @project.custom_field_values.empty?
               xml.created_on @project.created_on
               xml.updated_on @project.updated_on
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages