Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
    ... ... @@ -75,5 +75,5 @@ JComment {
    75 75 
     #delete {
    76 76 
       _observeAction:{DeleteDataUIAction.ACTION_NAME};
    77 77 
       visible:{model.isUpdatingMode()};
    78 
    -  enabled:{model.isValid()};
    78 
    +  enabled:{!model.isModified()};
    79 79 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss
    ... ... @@ -73,13 +73,13 @@
    73 73 
     }
    74 74
    75 75 
     #close {
    76 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())};
    76 
    +  enabled:{!model.isModified()};
    77 77 
       _toolTipText:{t("observe.common.ActivityDto.action.close.tip")};
    78 78 
     }
    79 79
    80 80 
     #closeAndCreate {
    81 
    +  enabled:{!model.isModified()};
    81 82 
       _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME};
    82 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())};
    83 83 
       _text:{t("observe.common.ActivityDto.action.closeAndCreate")};
    84 84 
       _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")};
    85 85 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss
    ... ... @@ -107,12 +107,12 @@
    107 107 
     }
    108 108
    109 109 
     #close {
    110 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()};
    110 
    +  enabled:{!model.isModified() && !dataContext.isOpenActivity()};
    111 111 
       _toolTipText:{t("observe.common.TripDto.action.close.tip")};
    112 112 
     }
    113 113
    114 114 
     #closeAndCreate {
    115 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()};
    115 
    +  enabled:{!model.isModified() && !dataContext.isOpenActivity()};
    116 116 
       _text:{t("observe.common.TripDto.action.closeAndCreate")};
    117 117 
       _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")};
    118 118 
       _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME};

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss
    ... ... @@ -156,12 +156,12 @@
    156 156 
     }
    157 157
    158 158 
     #close {
    159 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())};
    159 
    +  enabled:{!model.isModified()};
    160 160 
       _toolTipText:{t("observe.common.ActivityDto.action.close.tip")};
    161 161 
     }
    162 162
    163 163 
     #closeAndCreate {
    164 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())};
    164 
    +  enabled:{!model.isModified()};
    165 165 
       _text:{t("observe.common.ActivityDto.action.closeAndCreate")};
    166 166 
       _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")};
    167 167 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss
    ... ... @@ -273,7 +273,6 @@ JComment {
    273 273 
     #delete {
    274 274 
       _observeAction:{DeleteDataUIAction.ACTION_NAME};
    275 275 
       _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME};
    276 
    -  visible:{model.isUpdatingMode()};
    277 276 
       _toolTipText:{t("observe.action.delete.floatingObject.tip")};
    278 277 
     }
    279 278

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss
    ... ... @@ -51,12 +51,12 @@ NumberEditor {
    51 51 
     }
    52 52
    53 53 
     #close {
    54 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()};
    54 
    +  enabled:{!model.isModified() && !dataContext.isOpenActivity()};
    55 55 
       _toolTipText:{t("observe.common.RouteDto.action.close.tip")};
    56 56 
     }
    57 57
    58 58 
     #closeAndCreate {
    59 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()};
    59 
    +  enabled:{!model.isModified() && !dataContext.isOpenActivity()};
    60 60 
       _text:{t("observe.common.RouteDto.action.closeAndCreate")};
    61 61 
       _toolTipText:{t("observe.common.RouteDto.action.closeAndCreate.tip")};
    62 62 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss
    ... ... @@ -152,12 +152,12 @@ NumberEditor {
    152 152 
     }
    153 153
    154 154 
     #close {
    155 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()};
    155 
    +  enabled:{!model.isModified() && !dataContext.isOpenRoute()};
    156 156 
       _toolTipText:{t("observe.common.TripDto.action.close.tip")};
    157 157 
     }
    158 158
    159 159 
     #closeAndCreate {
    160 
    -  enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()};
    160 
    +  enabled:{!model.isModified() && !dataContext.isOpenRoute()};
    161 161 
       _text:{t("observe.common.TripDto.action.closeAndCreate")};
    162 162 
       _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")};
    163 163 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss
    ... ... @@ -41,7 +41,6 @@
    41 41 
     #delete {
    42 42 
       _observeAction:{DeleteDataUIAction.ACTION_NAME};
    43 43 
       _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME};
    44 
    -  visible:{model.isUpdatingMode()};
    45 44 
     }
    46 45
    47 46 
     #openActions {
    ... ... @@ -52,19 +51,16 @@
    52 51 
       _observeAction:{ReOpenUIAction.ACTION_NAME};
    53 52 
       _globalAction:{OpenDataGlobalUIAction.ACTION_NAME};
    54 53 
       visible:{model.isReadingMode() && model.isCanReopen()};
    55 
    -  enabled:{model.isReadingMode() && model.isCanReopen()};
    56 54 
     }
    57 55
    58 56 
     #close {
    59 57 
       _observeAction:{CloseOpenUIAction.ACTION_NAME};
    60 58 
       _globalAction:{CloseDataGlobalUIAction.ACTION_NAME};
    61 59 
       visible:{model.isUpdatingMode()};
    62 
    -  enabled:{model.isUpdatingMode()};
    63 60 
     }
    64 61
    65 62 
     #closeAndCreate {
    66 63 
       _observeAction:{CloseAndCreateUIAction.ACTION_NAME};
    67 64 
       _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME};
    68 65 
       visible:{model.isUpdatingMode()};
    69 
    -  enabled:{model.isUpdatingMode()};
    70 66 
     }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.