Merge pull request #2333 from opf/hotfix/17720_invalid_project_link_in_timelines_table

17720/17721 invalid project link in timelines table and cut off modal close icon

app/assets/javascripts/angular/timelines/models/project.js

@@ -39,7 +39,7 @@
 
 angular.module('openproject.timelines.models')
 
-.factory('Project', [function() {
+.factory('Project', ['PathHelper', function(PathHelper) {
 
   Project = {
     objectType: 'Project',
@@ -437,12 +437,8 @@ angular.module('openproject.timelines.models')
       return this.getParent();
     },
     getUrl: function() {
-      var options = this.timeline.options;
-      var url = options.url_prefix;
+      var url = PathHelper.staticProjectPath(this.identifier);
 
-      url += options.project_prefix;
-      url += "/";
-      url += this.identifier;
       url += "/timelines";
 
       return url;

app/assets/stylesheets/content/_modal.sass

@@ -111,3 +111,8 @@ ul.export-options
       span.export-label
         display: block
         padding: 10px 0 0 0
+
+// Legacy styles for jQuery UI modal
+
+.ui-dialog.ui-widget
+  overflow: visible

app/assets/stylesheets/legacy/_21_ajax_indicator.sass

@@ -63,9 +63,6 @@ body
 input::-webkit-input-placeholder, :-moz-placeholder
   color: #000000
 
-.ui-dialog
-  overflow: visible
-
 #ui-dialog-closer
   background-image: image-url("modal_close.png")
   cursor: pointer