1
0
mirror of https://github.com/cydrobolt/polr.git synced 2024-09-18 19:52:26 +02:00

Merge branch 'master' into master

This commit is contained in:
DT27 2018-02-22 10:30:51 +08:00 committed by GitHub
commit 298c22a821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -1,4 +1,5 @@
<!--- Provide a general summary of the issue in the Title above -->
<!--- IMPORTANT: Please follow the format displayed in this template, or your ticket may be ignored. -->
## Expected Behavior
<!--- If you're describing a bug, tell us what should happen -->

View File

@ -17,8 +17,8 @@ class AdminPaginationController extends Controller {
/* Cell rendering functions */
public function renderLongUrlCell($link) {
return '<a target="_blank" title="' . e($link->long_url) . '" href="'. $link->long_url .'">' . str_limit($link->long_url, 50) . '</a>
<a class="btn btn-primary btn-xs edit-long-link-btn" ng-click="editLongLink(\'' . $link->short_url . '\', \'' . $link->long_url . '\')"><i class="fa fa-edit edit-link-icon"></i></a>';
return '<a target="_blank" title="' . e($link->long_url) . '" href="'. e($link->long_url) .'">' . e(str_limit($link->long_url, 50)) . '</a>
<a class="btn btn-primary btn-xs edit-long-link-btn" ng-click="editLongLink(\'' . e($link->short_url) . '\', \'' . e($link->long_url) . '\')"><i class="fa fa-edit edit-link-icon"></i></a>';
}
public function renderClicksCell($link) {