Skip to content

Commit 47deec8

Browse files
Merge pull request #105 from NamutechCloudrnd/main
Fix typo bug
2 parents 5341b96 + 8f2643d commit 47deec8

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

docs/Datamanager-Usage-Guide.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@
9393

9494

9595
## 4. 데이터 마이그레이션
96-
<<<<<<< Updated upstream
9796
* [Data Manager Demo Guide](../docs/Datamanager-Demo-Guide.md) 참고
98-
=======
99-
* [Data Manager Demo Guide](./Datamanager-Demo-Guide.md) 참고
100-
>>>>>>> Stashed changes
10197

10298

service/osc/get.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,12 @@ func (osc *OSController) MGet(dirPath string, flt *filtering.ObjectFilter) error
8080
// return err
8181
// }
8282

83-
downlaodList, skipList := getDownloadList(fileList, srcObjList, dirPath, flt.PathExcludeYn)
83+
path := ""
84+
if flt != nil && flt.Path != "" {
85+
path = strings.TrimPrefix(flt.Path, "/")
86+
}
87+
88+
downlaodList, skipList := getDownloadList(fileList, srcObjList, path, flt.PathExcludeYn)
8489

8590
for _, skip := range skipList {
8691
osc.logWrite("Info", fmt.Sprintf("skip file : %s", skip.Key), nil)

web/templates/filter.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@
6969
</div>
7070
<div class="rounded-end border bg-light d-flex flex-column justify-content-center ps-3 pe-3" style="max-width: 105px; font-size: 0.9rem;">
7171
<div class="d-flex align-items-center">
72-
<input class="form-radio-input me-2" type="radio" id="mig-filter-texts-include" name="sourceFilter[containsExcludeYn]" value="n" checked>
72+
<input class="form-radio-input me-2" type="radio" id="mig-filter-texts-include" name="sourceFilter[containExcludeYn]" value="n" checked>
7373
<label class="form-check-label" for="mig-filter-texts-include">include</label>
7474
</div>
7575
<div class="d-flex align-items-center">
76-
<input class="form-radio-input me-2" type="radio" id="mig-filter-texts-exclude" name="sourceFilter[containsExcludeYn]" value="y">
76+
<input class="form-radio-input me-2" type="radio" id="mig-filter-texts-exclude" name="sourceFilter[containExcludeYn]" value="y">
7777
<label class="form-check-label" for="mig-filter-texts-exclude">exclude</label>
7878
</div>
7979
</div>

0 commit comments

Comments
 (0)