Merge pull request #18 from gtt-project/hotfix/standard_custom_fields

Fixed standard/custom fields listing

Author: sanak

app/controllers/smash_tags_controller.rb

@@ -7,6 +7,7 @@ class SmashTagsController < ApplicationController
 
   def index
     smash_tags = []
+    # Issue priorities
     priorities = []
     default_priority = nil
     # SMASH (Geopaparazzi) form spec: https://www.geopaparazzi.org/geopaparazzi/index.html#_using_form_based_notes
@@ -18,15 +19,34 @@ def index
         default_priority = priority.name
       end
     end
+    # Issue categories
+    categories = []
+    @project.issue_categories.each do |category|
+      categories.append({
+        item: category.name
+      })
+    end
+    # Versions
+    versions = []
+    default_version = nil
+    @project.versions.each do |version|
+      versions.append({
+        item: version.name
+      })
+    end
+    if @project.default_version.present?
+      default_version = @project.default_version.name
+    end
+    # Trackers
     @project.trackers.sort.each do |tracker|
       section = {
         sectionname: tracker.name,
-        sectiondescription: "",
+        sectiondescription: tracker.description,
         sectionicon: "image",
         forms: [{
           formname: tracker.name,
           formitems: [
-            # Default fields
+            # Core fields (undisablable)
             {
               key: "project_id",
               value: @project.id.to_s,
@@ -61,28 +81,105 @@ def index
               label: l(:field_is_private),
               type: "boolean",
               mandatory: "yes"
-            },
-            # TODO: Need to check 
-            # assigned_to_id, category_id, fixed_version_id, parent_issue_id,
-            # start_date, due_date, estimated_hours, done_ratio
-            {
-              key: "description",
-              label: l(:field_description),
-              value: "",
-              type: "string"
             }
           ]
         }]
       }
+      formitems = section[:forms][0][:formitems]
+      # Standard (core) fields
+      if tracker.core_fields.present?
+        # assigned_to_id (don't support)
+        # category_id
+        if tracker.core_fields.include?("category_id")
+          formitems.append({
+            key: "category_id",
+            label: l(:field_category),
+            values: {
+              items: categories
+            },
+            value: "",
+            type: "stringcombo",
+            # mandatory: "yes"
+          })
+        end
+        # fixed_version_id
+        if tracker.core_fields.include?("fixed_version_id")
+          formitems.append({
+            key: "fixed_version_id",
+            label: l(:field_version),
+            values: {
+              items: versions
+            },
+            value: default_version,
+            type: "stringcombo",
+            # mandatory: "yes"
+          })
+        end
+        # parent_issue_id (don't support)
+        # start_date
+        if tracker.core_fields.include?("start_date")
+          formitems.append({
+            key: "start_date",
+            label: l(:field_start_date),
+            value: "",
+            type: "date"
+          })
+        end
+        # due_date
+        if tracker.core_fields.include?("due_date")
+          formitems.append({
+            key: "due_date",
+            label: l(:field_due_date),
+            value: "",
+            type: "date"
+          })
+        end
+        # estimated_hours
+        if tracker.core_fields.include?("estimated_hours")
+          formitems.append({
+            key: "estimated_hours",
+            label: l(:field_estimated_hours),
+            value: "",
+            type: "integer"
+          })
+        end
+        # done_ratio
+        if tracker.core_fields.include?("done_ratio")
+          done_ratios = []
+          0.step(100, 10) {|ratio|
+            done_ratios.append({
+              item: "#{ratio} %"
+            })
+          }
+          formitems.append({
+            key: "done_ratio",
+            label: l(:field_done_ratio),
+            values: {
+              items: done_ratios
+            },
+            value: "0 %",
+            type: "stringcombo"
+          })
+        end
+        # description
+        if tracker.core_fields.include?("description")
+          formitems.append({
+            key: "description",
+            label: l(:field_description),
+            value: "",
+            type: "string"
+          })
+        end
+      end
       # Attachments
-      section[:forms][0][:formitems].append({
+      formitems.append({
         key: "attachments",
         value: "",
         type: "pictures"
       })
       # IssueCustomField mapping
       # Redmine: https://github.com/redmine/redmine/blob/master/lib/redmine/field_format.rb
-      IssueCustomField.where(is_for_all: true).sort.each do |icf|
+      tracker.custom_fields.each do |icf|
         type = "string"
         values = []
         case icf.field_format
@@ -134,7 +231,7 @@ def index
           }
         end
 
-        section[:forms][0][:formitems].append(formitem)
+        formitems.append(formitem)
       end
       smash_tags.append(section)
     end