Skip to content

Sprint5 b03526 b03525 conflict #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Jul 3, 2018
Merged

Sprint5 b03526 b03525 conflict #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28f9dd
Removed Url column and merged it into Auto Updating column
rladdusaw Jul 2, 2018
e905905
Merge Auto Updating and URL into a single column, after table structu…
kaladay Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions app/controllers/serviceController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
sortable: true
},
{
gloss: 'Auto Updating',
property: 'isAuto',
gloss: 'Auto Updating URL',
property: 'serviceUrl',
filterable: true,
sortable: true
},
Expand All @@ -50,12 +50,6 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
filterable: true,
sortable: true
},
{
gloss: 'URL',
property: 'serviceUrl',
filterable: true,
sortable: true
},
{
gloss: 'Project',
filterable: false,
Expand Down Expand Up @@ -177,4 +171,4 @@ app.controller('ServiceController', function($controller, $route, $scope, Projec
toolbar: "undo redo | formatselect bold italic separator | alignleft aligncenter alignright | bullist numlist | forecolor backcolor"
};

});
});
6 changes: 3 additions & 3 deletions app/views/management/services.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<tr ng-repeat="service in $data">
<td title="'Service'"><a href="{{'service/' + service.id + '/detail/'}}">{{service.name}}</a> <span ng-if="service.schedules.length > 0">(scheduled)</span></td>
<td title="'Status'">{{service.status}}</td>
<td title="'Auto Updating'">{{service.isAuto}}</td>
<td ng-if="service.isAuto" ng-attr-title="{{service.serviceUrl}}"><a href="{{service.serviceUrl}}">{{service.serviceUrl}}</a></td>
<td ng-if="!service.isAuto" title="'Auto Updating'">{{service.isAuto}}</td>
<td title="'Public'">{{service.isPublic}}</td>
<td title="'Short List'">{{service.onShortList}}</td>
<td title="'URL'">{{service.serviceUrl}}</td>
<td title="'Project'">{{getProject(service).name}}</td>
<td class="actions-column text-center" title="'Actions'">
<span class="glyphicon glyphicon-pencil" title="edit" ng-click="editService(service)"></span>
Expand All @@ -35,4 +35,4 @@
</weaver-table-modals>
</weaver-table>

</div>
</div>