Skip to content
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

Jump to bottom

Change DB2 service connector to Db2. #96

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change DB2 service connector to Db2. #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/admin_components/adf-services/dreamfactory-services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,8 +798,8 @@ angular.module('dfServices', ['ngRoute', 'dfUtility'])
"group": "SSO"
}, {
"name": "ibmdb2",
"label": "IBM DB2",
"description": "Database service supporting IBM DB2 SQL connections.",
"label": "IBM Db2",
"description": "Database service supporting IBM Db2 SQL connections.",
"group": "Database"
}, {
"name": "informix",
Expand Down
2 changes: 1 addition & 1 deletion dist/admin_components/adf-admins/views/df-manage-admins.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div> <!-- Admin Listing --> <div data-ng-hide="currentEditAdmin"> <!-- Section Header --> <df-section-header data-title="'Manage Admins'"></df-section-header> <!-- ToolBar --> <df-section-toolbar> <div class="btn-toolbar pull-left" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group" role="group" aria-label="Third group"> <df-toolbar-paginate data-api="'admin'"></df-toolbar-paginate> </div> <div class="btn-group" role="group" aria-label="Third group"> <input type="text" data-ng-model="$parent.filterText" data-ng-change="changeFilter($parent.filterText)" class="df-search-box" placeholder="Search"> </div> <div class="btn-group" role="group" aria-label="Third group"> <button class="btn btn-default btn-sm pull-right" data-ng-click="deleteSelectedAdmins()" data-ng-disabled="selectedAdmins.length === 0" title="Delete selected admins"><i class="fa fa-fw fa-trash"></i></button> </div> </div> <div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group" role="group" aria-label="Third group"> <div class="btn-group df-btn-group"> <button df-import-admins type="button" class="btn btn-default btn-sm" title="Import Admins from xml, json, or csv file" data-ng-click="importAdmins()"> <i class="fa fa-fw fa-upload"></i> </button> <a df-export-admins type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" title="Export admins to xml, json, or csv file"> <i class="fa fa-fw fa-download">&nbsp; </i> <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> <li data-ng-click="exportAdmins('csv')"> <a>CSV</a> </li> <li data-ng-click="exportAdmins('json')"> <a>JSON</a> </li> <li data-ng-click="exportAdmins('xml')"> <a>XML</a> </li> </ul> </div> </div> </div> <div style="clear: both"></div> </df-section-toolbar> <div data-ng-show="admins.length === 0 && !filterText"> <df-empty-section></df-empty-section> </div> <div data-ng-show="admins.length === 0 && filterText"> <df-empty-search-result></df-empty-search-result> </div> <div data-ng-show="admins.length > 0"> <div> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default" style="overflow-x: scroll"> <table class="table table-responsive table-bordered table-striped table-hover table-condensed"> <thead> <th></th> <th data-ng-class="order.orderBy === field.name ? 'df-th-selected' : ''" data-ng-click="orderOnSelect(field)" data-ng-repeat="field in fields"> <span class="df-th-text" style="white-space: nowrap">{{field.label}} <i style="margin-left: 5px" data-ng-if="order.orderBy === field.name" class="fa" data-ng-class="order.orderBy === field.name && order.orderByReverse ? 'fa-caret-down' : 'fa-caret-up'"></i> </span> </th> </thead> <tbody> <tr data-ng-repeat="obj in admins | orderObjectBy:order.orderBy:order.orderByReverse" class="repeated-item" class="repeated-item" data-ng-class="obj.__dfUI.selected ? 'danger' : ''"> <td style="width: 80px"> <div class="checkbox" style="margin: 0"> <label> <input id="admins_table_row_checkbox_{{obj.record.id}}" type="checkbox" data-ng-checked="obj.__dfUI.selected" data-ng-click="setSelected(obj)"> <div class="btn-group btn-group-xs"> <button id="admins_table_row_delete_{{obj.record.id}}" type="button" class="btn btn-default" data-ng-click="deleteAdmin(obj)" title="Delete admin"><i class="fa fa-trash"></i></button> </div> </label> </div> </td> <!-- Auto build table based on fieldorderobj in directive --> <!-- <td data-ng-click="editAdmin(obj.record)" data-ng-repeat="value in obj.record | orderAndShowValue : fields track by $index">{{value}}</td>--> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.id}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.email}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.name}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.first_name}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.last_name}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.is_active}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.confirm_msg}}</td> </tr> </tbody> </table> </div> </div> </div> </div> </div> </div> <!-- Edit Admin --> <div data-ng-show="currentEditAdmin"> <df-admin-details data-admin-data="currentEditAdmin" data-new-admin="false"></df-admin-details> </div> <!-- Import Admins Upload File Input--> <input style="display: none" type="file" id="upload" file-model="uploadFile"> </div>
<div> <!-- Admin Listing --> <div data-ng-hide="currentEditAdmin"> <!-- Section Header --> <df-section-header data-title="'Manage Admins'"></df-section-header> <!-- ToolBar --> <df-section-toolbar> <div class="btn-toolbar pull-left" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group" role="group" aria-label="Third group"> <df-toolbar-paginate data-api="'admin'"></df-toolbar-paginate> </div> <div class="btn-group" role="group" aria-label="Third group"> <input type="text" data-ng-model="$parent.filterText" data-ng-change="changeFilter($parent.filterText)" class="df-search-box" placeholder="Search"> </div> <div class="btn-group" role="group" aria-label="Third group"> <button class="btn btn-default btn-sm pull-right" data-ng-click="deleteSelectedAdmins()" data-ng-disabled="selectedAdmins.length === 0" title="Delete selected admins"><i class="fa fa-fw fa-trash"></i></button> </div> </div> <div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group" role="group" aria-label="Third group"> <div class="btn-group df-btn-group"> <button df-import-admins type="button" class="btn btn-default btn-sm" title="Import Admins from xml, json, or csv file" data-ng-click="importAdmins()"> <i class="fa fa-fw fa-upload"></i> </button> <a df-export-admins type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" title="Export admins to xml, json, or csv file"> <i class="fa fa-fw fa-download">&nbsp; </i> <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> <li data-ng-click="exportAdmins('csv')"> <a>CSV</a> </li> <li data-ng-click="exportAdmins('json')"> <a>JSON</a> </li> <li data-ng-click="exportAdmins('xml')"> <a>XML</a> </li> </ul> </div> </div> </div> <div style="clear: both"></div> </df-section-toolbar> <div data-ng-show="admins.length === 0 && !filterText"> <df-empty-section></df-empty-section> </div> <div data-ng-show="admins.length === 0 && filterText"> <df-empty-search-result></df-empty-search-result> </div> <div data-ng-show="admins.length > 0"> <div> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default" style="overflow-x: scroll"> <table class="table table-responsive table-bordered table-striped table-hover table-condensed"> <thead> <th></th> <th data-ng-class="order.orderBy === field.name ? 'df-th-selected' : ''" data-ng-click="orderOnSelect(field)" data-ng-repeat="field in fields"> <span class="df-th-text" style="white-space: nowrap">{{field.label}} <i style="margin-left: 5px;" data-ng-if="order.orderBy === field.name" class="fa" data-ng-class="order.orderBy === field.name && order.orderByReverse ? 'fa-caret-down' : 'fa-caret-up'"></i> </span> </th> </thead> <tbody> <tr data-ng-repeat="obj in admins | orderObjectBy:order.orderBy:order.orderByReverse" class="repeated-item" class="repeated-item" data-ng-class="obj.__dfUI.selected ? 'danger' : ''"> <td style="width: 80px"> <div class="checkbox" style="margin: 0"> <label> <input id="admins_table_row_checkbox_{{obj.record.id}}" type="checkbox" data-ng-checked="obj.__dfUI.selected" data-ng-click="setSelected(obj)"> <div class="btn-group btn-group-xs"> <button id="admins_table_row_delete_{{obj.record.id}}" type="button" class="btn btn-default" data-ng-click="deleteAdmin(obj)" title="Delete admin"><i class="fa fa-trash"></i></button> </div> </label> </div> </td> <!-- Auto build table based on fieldorderobj in directive --> <!-- <td data-ng-click="editAdmin(obj.record)" data-ng-repeat="value in obj.record | orderAndShowValue : fields track by $index">{{value}}</td>--> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.id}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.email}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.name}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.first_name}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.last_name}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.is_active}}</td> <td id="admins_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editAdmin(obj.record)">{{obj.record.confirm_msg}}</td> </tr> </tbody> </table> </div> </div> </div> </div> </div> </div> <!-- Edit Admin --> <div data-ng-show="currentEditAdmin"> <df-admin-details data-admin-data="currentEditAdmin" data-new-admin="false"></df-admin-details> </div> <!-- Import Admins Upload File Input--> <input style="display: none" type="file" id="upload" file-model="uploadFile"> </div>
2 changes: 1 addition & 1 deletion dist/admin_components/adf-apps/views/df-manage-apps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div> <div data-ng-hide="currentEditApp"> <!-- Section Heading --> <df-section-header data-title="'Manage Applications'"></df-section-header> <!-- Toolbar --> <df-section-toolbar> <df-toolbar-paginate data-api="'app'"></df-toolbar-paginate> <div class="btn-group btn-group-sm hidden-xs df-btn-group"> <button class="btn btn-default" data-ng-click="deleteSelectedApps()" data-ng-disabled="selectedApps.length === 0" title="Delete selected apps"><i class="fa fa-fw fa-trash"></i></button> </div> <df-download-sdk data-btn-size="'btn-group-sm'"></df-download-sdk> <div style="clear: both"></div> </df-section-toolbar> <div data-ng-show="apps.length === 0 && emptySectionOptions.active"> <df-empty-section></df-empty-section> </div> <div data-ng-show="apps.length > 0"> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default"> <table class="table table-responsive table-bordered table-striped table-hover table-condensed"> <thead> <th></th> <th data-ng-class="order.orderBy === field.name ? 'df-th-selected' : ''" data-ng-click="orderOnSelect(field)" data-ng-repeat="field in fields"> <span class="df-th-text" style="white-space: nowrap">{{field.label}} <i style="margin-left: 5px" data-ng-if="order.orderBy === field.name" class="fa" data-ng-class="order.orderBy === field.name && order.orderByReverse ? 'fa-caret-down' : 'fa-caret-up'"></i> </span> </th> </thead> <tbody> <tr data-ng-repeat="obj in apps | orderObjectBy:order.orderBy:order.orderByReverse" class="repeated-item" data-ng-class="obj.__dfUI.selected ? 'danger' : ''"> <td style="width: 80px"> <div class="btn-group btn-group-xs"> <div class="" style="margin-right: 5px; display: inline-block; float:left"> <input id="apps_table_row_checkbox_{{obj.record.id}}" type="checkbox" data-ng-checked="obj.__dfUI.selected" data-ng-click="setSelected(obj)"> </div> <button id="apps_table_row_delete_{{obj.record.id}}" type="button" class="btn btn-default btn-xs" data-ng-click="deleteApp(obj)" title="Delete app"><i class="fa fa-trash"></i></button> <button id="apps_table_row_launch_{{obj.record.id}}" type="button" class="btn btn-default btn-xs" data-ng-click="launchApp(obj)" data-ng-disabled="!obj.record.launch_url" title="Launch app"><i class="fa fa-play"></i></button> </div> </td> <td id="apps_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editApp(obj.record)" data-ng-repeat="value in obj.record | orderAndShowValue : fields track by $index"> <span ng-if="fields[$index].name === 'api_key'" style="white-space:nowrap"> <span id="apps_table_row_{{$index}}_{{obj.record.id}}_api_key">{{value}}</span> &nbsp; <i class="fa fa-clipboard" ngclipboard data-clipboard-target="#apps_table_row_{{$index}}_{{obj.record.id}}_api_key" data-ng-click="$event.stopPropagation()" title="Copy to clipboard"></i> </span> <span ng-if="fields[$index].name === 'role_by_role_id'"> {{value.name}} </span> <span ng-if="fields[$index].name !== 'api_key' && fields[$index].name != 'role_by_role_id'"> {{value}} </span> </td> </tr> </tbody> </table> </div> </div> </div> </div> </div> <!-- Edit App --> <div data-ng-show="currentEditApp"> <df-app-details data-app-data="currentEditApp" data-new-app="false" data-api-data="apiData"></df-app-details> </div> </div>
<div> <div data-ng-hide="currentEditApp"> <!-- Section Heading --> <df-section-header data-title="'Manage Applications'"></df-section-header> <!-- Toolbar --> <df-section-toolbar> <df-toolbar-paginate data-api="'app'"></df-toolbar-paginate> <div class="btn-group btn-group-sm hidden-xs df-btn-group"> <button class="btn btn-default" data-ng-click="deleteSelectedApps()" data-ng-disabled="selectedApps.length === 0" title="Delete selected apps"><i class="fa fa-fw fa-trash"></i></button> </div> <df-download-sdk data-btn-size="'btn-group-sm'"></df-download-sdk> <div style="clear: both"></div> </df-section-toolbar> <div data-ng-show="apps.length === 0 && emptySectionOptions.active"> <df-empty-section></df-empty-section> </div> <div data-ng-show="apps.length > 0"> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default"> <table class="table table-responsive table-bordered table-striped table-hover table-condensed"> <thead> <th></th> <th data-ng-class="order.orderBy === field.name ? 'df-th-selected' : ''" data-ng-click="orderOnSelect(field)" data-ng-repeat="field in fields"> <span class="df-th-text" style="white-space: nowrap">{{field.label}} <i style="margin-left: 5px;" data-ng-if="order.orderBy === field.name" class="fa" data-ng-class="order.orderBy === field.name && order.orderByReverse ? 'fa-caret-down' : 'fa-caret-up'"></i> </span> </th> </thead> <tbody> <tr data-ng-repeat="obj in apps | orderObjectBy:order.orderBy:order.orderByReverse" class="repeated-item" data-ng-class="obj.__dfUI.selected ? 'danger' : ''"> <td style="width: 80px;"> <div class="btn-group btn-group-xs"> <div class="" style="margin-right: 5px; display: inline-block; float:left"> <input id="apps_table_row_checkbox_{{obj.record.id}}" type="checkbox" data-ng-checked="obj.__dfUI.selected" data-ng-click="setSelected(obj)"> </div> <button id="apps_table_row_delete_{{obj.record.id}}" type="button" class="btn btn-default btn-xs" data-ng-click="deleteApp(obj)" title="Delete app"><i class="fa fa-trash"></i></button> <button id="apps_table_row_launch_{{obj.record.id}}" type="button" class="btn btn-default btn-xs" data-ng-click="launchApp(obj)" data-ng-disabled="!obj.record.launch_url" title="Launch app"><i class="fa fa-play"></i></button> </div> </td> <td id="apps_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editApp(obj.record)" data-ng-repeat="value in obj.record | orderAndShowValue : fields track by $index"> <span ng-if="fields[$index].name === 'api_key'" style="white-space:nowrap;"> <span id="apps_table_row_{{$index}}_{{obj.record.id}}_api_key">{{value}}</span> &nbsp; <i class="fa fa-clipboard" ngclipboard data-clipboard-target="#apps_table_row_{{$index}}_{{obj.record.id}}_api_key" data-ng-click="$event.stopPropagation()" title="Copy to clipboard"></i> </span> <span ng-if="fields[$index].name === 'role_by_role_id'"> {{value.name}} </span> <span ng-if="fields[$index].name !== 'api_key' && fields[$index].name != 'role_by_role_id'"> {{value}} </span> </td> </tr> </tbody> </table> </div> </div> </div> </div> </div> <!-- Edit App --> <div data-ng-show="currentEditApp"> <df-app-details data-app-data="currentEditApp" data-new-app="false" data-api-data="apiData"></df-app-details> </div> </div>
2 changes: 1 addition & 1 deletion dist/admin_components/adf-launchpad/views/df-app-group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="panel panel-default"> <a data-toggle="collapse" data-target="#app-group-{{appGroup.id}}"> <div class="panel-heading"> <h3 class="panel-title"> {{appGroup.name}} </h3> <p style="padding-left: 10px" class="group-description">{{appGroup.description}}</p> </div> </a> <div id="app-group-{{appGroup.id}}" class="panel-collapse collapse"> <ul class="list-group"> <df-app data-app="app" data-ng-repeat="app in appGroup.app"></df-app> </ul> </div> </div>
<div class="panel panel-default"> <a data-toggle="collapse" data-target="#app-group-{{appGroup.id}}"> <div class="panel-heading"> <h3 class="panel-title"> {{appGroup.name}} </h3> <p style="padding-left: 10px;" class="group-description">{{appGroup.description}}</p> </div> </a> <div id="app-group-{{appGroup.id}}" class="panel-collapse collapse"> <ul class="list-group"> <df-app data-app="app" data-ng-repeat="app in appGroup.app"></df-app> </ul> </div> </div>
Loading