* Fix bug#37283

module/job/control.php

@@ -223,17 +223,22 @@ class job extends control
         $this->view->repo = $this->loadModel('repo')->getByID($job->repo);
 
         if($repo->SCM == 'Gitlab') $this->view->refList = $this->loadModel('gitlab')->getReferenceOptions($repo->gitService, $repo->project);
-        if($repo->SCM == 'Subversion')
+        if($repo->SCM == 'Subversion' && $job->triggerType == 'tag')
         {
             $dirs = array();
+            $path = empty($repo->prefix) ? '/' : $this->repo->decodePath('');
             $tags = $this->loadModel('svn')->getRepoTags($repo, $path);
             if($tags)
             {
-                $path = empty($repo->prefix) ? '/' : $this->repo->decodePath('');
-                $dirs['/'] = $this->loadrepo->encodePath($path);
-                foreach($tags as $dirPath => $dirName) $dirs[$dirPath] = $this->repo->encodePath($dirPath);
+                $dirs['/'] = $path;
+                foreach($tags as $dirPath => $dirName) $dirs[$dirPath] = $dirPath;
             }
             $this->view->dirs = $dirs;
+
+            foreach($this->lang->job->triggerTypeList as $type => $name)
+            {
+                if($type == 'tag') $this->lang->job->triggerTypeList[$type] = $this->lang->job->dirChange;
+            }
         }
 
         $repoList             = $this->repo->getList($this->projectID);

module/job/js/create.ui.js

@@ -116,6 +116,13 @@ function changeRepo(event)
                     $('#svnDirBox').append(html);
                 })
             }
+
+            var triggerOptions = $('#triggerType').zui('picker').options.items;
+            for(i in triggerOptions)
+            {
+                if(triggerOptions[i].value == 'tag') triggerOptions[i].text = data.type != 'subversion' ? buildTag : dirChange;
+            }
+            $('#triggerType').zui('picker').render({items: triggerOptions});
         }
     });
 

module/job/js/edit.ui.js

@@ -108,6 +108,13 @@ function changeRepo(event)
                     $('#svnDirBox').append(html);
                 })
             }
+
+            var triggerOptions = $('#triggerType').zui('picker').options.items;
+            for(i in triggerOptions)
+            {
+                if(triggerOptions[i].value == 'tag') triggerOptions[i].text = data.type != 'subversion' ? buildTag : dirChange;
+            }
+            $('#triggerType').zui('picker').render({items: triggerOptions});
         }
     });
 
@@ -165,7 +172,7 @@ function changeTriggerType(event)
     {
         var type = event;
     }
-    $('.svn-fields').addClass('hidden');
+    dirs ? $('.svn-fields').removeClass('hidden') : $('.svn-fields').addClass('hidden');
     $('.comment-fields').addClass('hidden');
     $('.custom-fields').addClass('hidden');
     if(type == 'commit')   $('.comment-fields').removeClass('hidden');

module/job/ui/edit.html.php

@@ -17,6 +17,7 @@ jsVar('engine', $job->engine);
 jsVar('job', $job);
 jsVar('dirChange', $lang->job->dirChange);
 jsVar('buildTag', $lang->job->buildTag);
+jsVar('dirs', !empty($dirs) ? $dirs : '');
 
 if($job->customParam)
 {