Skip to content

Commit

Permalink
Issue #SB-2445 fix: revert reverted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@gouravmore
gouravmore committed Oct 8, 2018
1 parent cb60f97 commit ea4e63d
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions org.ekstep.metadata-1.2/editor/templates/resourceFilterTemplate.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@
<div class="ui sub header paraHeading">
<p class="padding-top-3px">{{dynamicField.label | uppercase}} ({{contentMeta[dynamicField.code].length || 0}})</p>
</div>
<select id="_select{{dynamicField.code}} " name="{{dynamicField.code}} " class="ui fluid search dropdown placeholder-padding lableCls " ng-class="!dynamicField.editable ? ' disabled ': ' ' " ng-model="contentMeta[dynamicField.code]" ng-change="onConfigChange({target: '#resourceFilterTemplate', index:$index, field:dynamicField, value:contentMeta[dynamicField.code], form:metaForm});$parent.$parent.getFiltersValue(contentMeta);" multiple=" " ng-required="{{dynamicField.required}} ">
<option value="">{{dynamicField.placeholder}}</option>
<option data-value="{{category.name || category}} " ng-repeat="category in categoryList[dynamicField.code]" ng-selected="category.name && (contentMeta[dynamicField.code] == category.name) || (contentMeta[dynamicField.code] == category)">{{category.name || category}}</option>
</select>
<div data-tooltip="{{contentMeta[dynamicField.code].length ? contentMeta[dynamicField.code].join(', ') : dynamicField.placeholder}}" data-variation="basic">
<select id="_select{{dynamicField.code}} " name="{{dynamicField.code}} " class="ui fluid search downward dropdown placeholder-padding lableCls " ng-class="!dynamicField.editable ? ' disabled ': ' ' " ng-model="contentMeta[dynamicField.code]" ng-change="onConfigChange({target: '#resourceFilterTemplate', index:$index, field:dynamicField, value:contentMeta[dynamicField.code], form:metaForm});$parent.$parent.getFiltersValue(contentMeta);" multiple=" " ng-required="{{dynamicField.required}} ">
<option value="">{{dynamicField.placeholder}}</option>
<option data-value="{{category.name || category}} " ng-repeat="category in categoryList[dynamicField.code]" ng-selected="category.name && (contentMeta[dynamicField.code] == category.name) || (contentMeta[dynamicField.code] == category)">{{category.name || category}}</option>
</select>
</div>
<div ng-show="!metaForm[dynamicField.code].$valid " class="ui pointing red basic label ">
Please Select
</div>
Expand All @@ -48,11 +50,13 @@
<div class="ui sub header paraHeading">
<p class="padding-top-3px">{{dynamicField.label | uppercase}}</p>
</div>
<select id="_select{{dynamicField.code}} " name="{{dynamicField.code}} " class="ui fluid search dropdown placeholder-padding lableCls" ng-class="!dynamicField.editable ? ' disabled ': ' ' " ng-model="contentMeta[dynamicField.code]" ng-change="onConfigChange({target: '#resourceFilterTemplate', index:$index, field:dynamicField, value:contentMeta[dynamicField.code], form:metaForm});$parent.$parent.getFiltersValue(contentMeta);"
ng-required="{{dynamicField.required}} ">
<option value = "">{{dynamicField.placeholder}}</option>
<option data-value="{{category.name || category}} " ng-repeat="category in categoryList[dynamicField.code]" ng-selected="category.name && (contentMeta[dynamicField.code] == category.name) || (contentMeta[dynamicField.code] == category)" >{{category.name || category}}</option>
</select>
<div data-tooltip="{{contentMeta[dynamicField.code] ? contentMeta[dynamicField.code] : dynamicField.placeholder}}" data-variation="basic">
<select id="_select{{dynamicField.code}} " name="{{dynamicField.code}} " class="ui fluid search downward dropdown placeholder-padding lableCls" ng-class="!dynamicField.editable ? ' disabled ': ' ' " ng-model="contentMeta[dynamicField.code]" ng-change="onConfigChange({target: '#resourceFilterTemplate', index:$index, field:dynamicField, value:contentMeta[dynamicField.code], form:metaForm});$parent.$parent.getFiltersValue(contentMeta);"
ng-required="{{dynamicField.required}} ">
<option value = "">{{dynamicField.placeholder}}</option>
<option data-value="{{category.name || category}} " ng-repeat="category in categoryList[dynamicField.code]" ng-selected="category.name && (contentMeta[dynamicField.code] == category.name) || (contentMeta[dynamicField.code] == category)" >{{category.name || category}}</option>
</select>
</div>
<div ng-show="!metaForm[dynamicField.code].$valid && isSubmit" class="ui pointing red basic label ">
Please Select
</div>
Expand All @@ -65,7 +69,7 @@
<div class="ui sub header paraHeading">
<p class="padding-top-3px">{{dynamicField.label | uppercase}} ({{contentMeta[dynamicField.code].length || 0}})</p>
</div>
<conceptselector class="concept-field" config=dynamicField ng-click="onConfigChange({target: '#resourceFilterTemplate', field:dynamicField, form:metaForm});"></conceptselector>
<conceptselector data-tooltip="{{contentMeta[dynamicField.code].length ? contentMeta[dynamicField.code].join(', ') : dynamicField.placeholder}}" class="concept-field" config=dynamicField ng-click="onConfigChange({target: '#resourceFilterTemplate', field:dynamicField, form:metaForm});"></conceptselector>
</div>
</div>
<!-- TOPIC SELECTOR -->
Expand All @@ -74,7 +78,7 @@
<div class="ui sub header paraHeading">
<p class="padding-top-3px">{{dynamicField.label | uppercase}} ({{contentMeta[dynamicField.code].length || 0}})</p>
</div>
<topic-selector class="concept-field" config=dynamicField ng-click="onConfigChange({target: '#resourceFilterTemplate', field:dynamicField, form:metaForm})"></topic-selector>
<topic-selector data-tooltip="{{contentMeta[dynamicField.code].length ? contentMeta[dynamicField.code].join(', ') : dynamicField.placeholder}}" class="concept-field" config=dynamicField ng-click="onConfigChange({target: '#resourceFilterTemplate', field:dynamicField, form:metaForm})"></topic-selector>
</div>
</div>
</div>
Expand Down

0 comments on commit ea4e63d

Please sign in to comment.