diff --git a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue index a2158a4915d47e94aaad7e92c4133c6bd7d155a5..27b35bd2c40b1ab36f66598e139f10a15772ae35 100644 --- a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue +++ b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue @@ -1204,7 +1204,7 @@ export default LexicalUnitEdit; <td class="table-button-menu-td" id="remove-sel-pref" style="padding: 10px 15px 10px 15px; color: #000000;" @click="removeSelectionalPreference">Usuń prefer.</td> <td class="table-button-menu-td" id="change-windows" style="padding: 10px 15px 10px 15px; color: #000000;" @click="swapUnifiedFrames">Zamień okna</td> - <td class="table-button-menu-td" v-if="frames.length == 0 || isSuperLeksykograf()" id="delete-frame" style="padding: 10px 15px 10px 15px; color: #000000;" @click="deleteUnifiedFrames">Usuń ramę</td> + <td class="table-button-menu-td" v-if="frames.length == 0 || isSuperLeksykograf() || unified_frame.status == 'O'" id="delete-frame" style="padding: 10px 15px 10px 15px; color: #000000;" @click="deleteUnifiedFrames">Usuń ramę</td> <td class="table-button-menu-td" v-else id="empty-1" style="padding: 10px 15px 10px 15px; color: #000000;"></td> <td class="table-button-menu-td" v-if="isSuperLeksykograf()" id="empty-3" style="padding: 10px 15px 10px 15px; color: #000000;"></td> @@ -1344,7 +1344,7 @@ export default LexicalUnitEdit; <td id="attach-slowal-frame" class="table-button-menu-td" style="padding: 10px 15px 10px 15px; color: #000000;" @click="attachSlowalFrame">Podepnij</td> </tr> <tr style="background-color: white;"> - <td id="inccorect-slowal-frame" class="table-button-menu-td" style="padding: 10px 15px 10px 15px; color: #000000;" @click="!this.isSuperLeksykograf() ? change_slowal_frame_status('C') : this.active_slowal_frame && this.active_slowal_frame.status === 'C' ? slowal_frame_status_change_with_confirmation('frame_confirm_as_not_matching_unified_frame') : change_slowal_frame_status('C')"> + <td id="inccorect-slowal-frame" class="table-button-menu-td" style="padding: 10px 15px 10px 15px; color: #000000;" @click="slowal_frame_status_change_with_confirmation('frame_confirm_as_not_matching_unified_frame')"> {{createSlowalContestedStatusButtonLabel()}} </td> <td id="show-slowal-frame" class="table-button-menu-td" style="padding: 10px 15px 10px 15px; color: #000000;" @click="resetFrameVisibilityRestictions()"> diff --git a/unifier/views.py b/unifier/views.py index 7ffaabbcac4a80f1e525494be3f03b4a8dc24cc1..819d142a7467ca58034f1341e800a44ab0cdb177 100644 --- a/unifier/views.py +++ b/unifier/views.py @@ -140,7 +140,7 @@ def save_bunch_of_preferences_base(frame_id, complement_id, predefined_preferenc for synset_id in synset_ids: check_sysnet_hierarchy_constraints_ret = save_synset_preference(frame_id, complement_id, synset_id) - if not check_sysnet_hierarchy_constraints_ret['succ'] is False: + if check_sysnet_hierarchy_constraints_ret['succ'] is False: transaction.set_rollback(True) return check_sysnet_hierarchy_constraints_ret @@ -357,11 +357,6 @@ def get_unified_frame_json(unified_frame, request): local_schema_filter_form = None local_frame_filter_form = None - import datetime - now = datetime.datetime.now() - print("1 Current date and time : ") - print(now.strftime("%Y-%m-%d %H:%M:%S")) - if 'no_filters' in request.POST: apply_filters = not simplejson.loads(request.POST['no_filters']) local_schema_filter_form = get_local_schema_filter_form(apply_filters, request)