atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject [2/2] incubator-atlas git commit: ATLAS-1832: If no attribute is present in tag then showing edit-button for a tag in tags tab on entity page.
Date Tue, 13 Jun 2017 09:33:35 GMT
ATLAS-1832: If no attribute is present in tag then showing edit-button for a tag in tags tab
on entity page.

Signed-off-by: nixonrodrigues <nixon@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/8f2df311
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/8f2df311
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/8f2df311

Branch: refs/heads/0.8-incubating
Commit: 8f2df3111aec7052e60bb79aab5f2b0680386fa6
Parents: 4076597
Author: Kalyani <kalyani.kashikar@freestoneinfotech.com>
Authored: Tue Jun 13 12:21:54 2017 +0530
Committer: nixonrodrigues <nixon@apache.org>
Committed: Tue Jun 13 14:59:06 2017 +0530

----------------------------------------------------------------------
 .../js/templates/audit/CreateAuditTableLayoutView_tmpl.html | 2 +-
 dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/8f2df311/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
index fc8e6cc..736b957 100644
--- a/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
@@ -23,4 +23,4 @@
     <tbody data-id="auditValue">
     </tbody>
 </table>
-<h3 data-id="noData" style="display:none">No details to show</h3>
+<h4 data-id="noData" style="display:none">No details to show</h4>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/8f2df311/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
index cdbd00f..45cdd6b 100644
--- a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
@@ -155,11 +155,16 @@ define(['require',
                             sortable: false,
                             formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
                                 fromRaw: function(rawValue, model) {
-                                    return '<button class="btn btn-atlasAction btn-atlas
no-margin-bottom typeLOV" data-id="delete" data-name="' + model.get('typeName') + '"><i
class="fa fa-trash"></i></button> <button class="btn btn-atlasAction btn-atlas
no-margin-bottom typeLOV" data-id="edit" data-name="' + model.get('typeName') + '"><i
class="fa fa-pencil"></i></button>';
+                                    var deleteData = '<button class="btn btn-atlasAction
btn-atlas no-margin-bottom typeLOV" data-id="delete" data-name="' + model.get('typeName')
+ '"><i class="fa fa-trash"></i></button>',
+                                        editData = '<button class="btn btn-atlasAction
btn-atlas no-margin-bottom typeLOV" data-id="edit" data-name="' + model.get('typeName') +
'"><i class="fa fa-pencil"></i></button>';
+                                    if (model.get('attributes') === undefined) {
+                                        return deleteData;
+                                    } else {
+                                        return deleteData + editData;
+                                    }
                                 }
                             })
                         },
-
                     },
                     this.tagTermCollection);
             },


Mime
View raw message