diff --git a/module/design/control.php b/module/design/control.php index 601a926bca..4607719e4f 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -230,6 +230,7 @@ class design extends control $this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList('design', $design->id); + $this->view->repos = $this->loadModel('repo')->getRepoPairs('project', $design->project); $this->display(); } diff --git a/module/design/js/view.js b/module/design/js/view.js index 169bc7dcd8..07bfc10662 100644 --- a/module/design/js/view.js +++ b/module/design/js/view.js @@ -1,4 +1,19 @@ $(function() { $('#subNavbar .nav li[data-id=' + type.toLowerCase() + ']').addClass('active'); + $('#linkCommit').click(function() + { + if(repos.length == 0) + { + var onlybody = config.onlybody; + config.onlybody = 'no'; + + var link = createLink('repo', 'create', 'objectID=' + projectID); + + config.onlybody = onlybody; + window.parent.$.apps.open(link, 'project'); + + return false; + } + }); }) diff --git a/module/design/js/viewcommit.js b/module/design/js/viewcommit.js index 56db3f864e..6d486b3137 100644 --- a/module/design/js/viewcommit.js +++ b/module/design/js/viewcommit.js @@ -10,9 +10,7 @@ $(function() var link = createLink('repo', 'create', 'objectID=' + projectID); config.onlybody = onlybody; - window.parent.$.apps.open(link, 'devops'); - - parent.$('#triggerModal').modal('hide'); + window.parent.$.apps.open(link, 'project'); return false; } diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php index 0f723b76e8..a00c782294 100644 --- a/module/design/view/view.html.php +++ b/module/design/view/view.html.php @@ -12,6 +12,8 @@ ?> type);?> + +project);?>